HowardHinnant/date
1
0
Fork 1
mirror of https://github.com/HowardHinnant/date.git synced 2025-08-04 13:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow zoned_time conversion among different TimeZonePtr types

Browse Source
This commit is contained in:
Howard Hinnant
2017-10-28 18:18:42 -04:00
parent 4b73a42d02
commit fa6529a2fc
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/date/tz.h
View File

@@ -417,8 +417,21 @@ public:
#endif #endif
zoned_time(TimeZonePtr z, const local_time<Duration>& tp, choose c); zoned_time(TimeZonePtr z, const local_time<Duration>& tp, choose c);
zoned_time(TimeZonePtr z, const zoned_time& zt); template <class Duration2, class TimeZonePtr2,
zoned_time(TimeZonePtr z, const zoned_time& zt, choose); class = typename std::enable_if
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value
>::type>
zoned_time(TimeZonePtr z, const zoned_time<Duration2, TimeZonePtr2>& zt);
template <class Duration2, class TimeZonePtr2,
class = typename std::enable_if
<
std::is_convertible<sys_time<Duration2>,
sys_time<Duration>>::value
>::type>
zoned_time(TimeZonePtr z, const zoned_time<Duration2, TimeZonePtr2>& zt, choose);
#if HAS_STRING_VIEW #if HAS_STRING_VIEW
@@ -718,6 +731,14 @@ template <class Duration>
zoned_time(const char*, local_time<Duration>, choose = choose::earliest) zoned_time(const char*, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>; -> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Duration, class TimeZonePtr, class TimeZonePtr2>
zoned_time(TimeZonePtr, zoned_time<Duration, TimeZonePtr2>)
-> zoned_time<Duration, TimeZonePtr>;
template <class Duration, class TimeZonePtr, class TimeZonePtr2>
zoned_time(TimeZonePtr, zoned_time<Duration, TimeZonePtr2>, choose)
-> zoned_time<Duration, TimeZonePtr>;
#endif // HAS_DEDUCTION_GUIDES #endif // HAS_DEDUCTION_GUIDES
template <class Duration1, class Duration2, class TimeZonePtr> template <class Duration1, class Duration2, class TimeZonePtr>
@@ -1403,17 +1424,19 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Du
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
template <class Duration2, class TimeZonePtr2, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z,
const zoned_time<Duration, TimeZonePtr>& zt) const zoned_time<Duration2, TimeZonePtr2>& zt)
: zone_(std::move(z)) : zone_(std::move(z))
, tp_(zt.tp_) , tp_(zt.tp_)
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
template <class Duration2, class TimeZonePtr2, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z,
const zoned_time<Duration, TimeZonePtr>& zt, choose) const zoned_time<Duration2, TimeZonePtr2>& zt, choose)
: zoned_time(std::move(z), zt) : zoned_time(std::move(z), zt)
{} {}