3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 08:31:03 +08:00
Code Issues Projects Releases Wiki Activity

Add zoned_time deduction guides

Browse Source
This commit is contained in:
Howard Hinnant 2017-07-06 20:49:53 -04:00
parent 893cf51fd8
commit c8d3cc14da
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/testit
View File

@ -48,7 +48,7 @@ if [ -z "$CXX_LANG" ]
then then
CXX_LANG=c++14 CXX_LANG=c++14
fi fi
OPTIONS="-std=${CXX_LANG} $OPTIONS -I$ROOT -Wall" OPTIONS="-std=${CXX_LANG} $OPTIONS -I$ROOT -Wall $ROOT/tz.cpp -lcurl"
case $TRIPLE in case $TRIPLE in
*-*-mingw* | *-*-cygwin* | *-*-win*) *-*-mingw* | *-*-cygwin* | *-*-win*)

30
tz.h
View File

@ -87,6 +87,14 @@ static_assert(HAS_REMOTE_API == 0 ? AUTO_DOWNLOAD == 0 : true,
# define MISSING_LEAP_SECONDS 0 # define MISSING_LEAP_SECONDS 0
#endif #endif
#ifndef HAS_DEDUCTION_GUIDES
# if __cplusplus >= 201703
# define HAS_DEDUCTION_GUIDES 1
# else
# define HAS_DEDUCTION_GUIDES 0
# endif
#endif // HAS_DEDUCTION_GUIDES
#include "date.h" #include "date.h"
#if defined(_MSC_VER) && (_MSC_VER < 1900) #if defined(_MSC_VER) && (_MSC_VER < 1900)
@ -319,7 +327,7 @@ public:
zoned_time& operator=(const sys_time<Duration>& st); zoned_time& operator=(const sys_time<Duration>& st);
zoned_time& operator=(const local_time<Duration>& ut); zoned_time& operator=(const local_time<Duration>& ut);
operator sys_time<duration>() const; explicit operator sys_time<duration>() const;
explicit operator local_time<duration>() const; explicit operator local_time<duration>() const;
const time_zone* get_time_zone() const; const time_zone* get_time_zone() const;
@ -343,6 +351,26 @@ private:
using zoned_seconds = zoned_time<std::chrono::seconds>; using zoned_seconds = zoned_time<std::chrono::seconds>;
#if HAS_DEDUCTION_GUIDES
template <class Duration>
zoned_time(sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Zone, class Duration>
zoned_time(Zone, sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Zone, class Duration>
zoned_time(Zone, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Zone, class Duration>
zoned_time(Zone, zoned_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
#endif // HAS_DEDUCTION_GUIDES
template <class Duration1, class Duration2> template <class Duration1, class Duration2>
inline inline
bool bool