feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Fix zoned_time deduction guides

Browse Source
This commit is contained in:
Howard Hinnant
2018-04-23 20:30:58 -04:00
parent c665992a6e
commit 88c661e9f3
1 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
include/date/tz.h
View File

@@ -707,57 +707,45 @@ template <class Duration>
zoned_time(sys_time<Duration>) zoned_time(sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>; -> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class TimeZonePtr> template <class TimeZonePtrOrName>
zoned_time(TimeZonePtr) zoned_time(TimeZonePtrOrName)
-> zoned_time<std::chrono::seconds, TimeZonePtr>; -> zoned_time<std::chrono::seconds,
std::conditional_t
<
std::is_convertible<TimeZonePtrOrName, std::string_view>::value,
time_zone const*,
TimeZonePtrOrName
>>;
template <class TimeZonePtr, class Duration> template <class TimeZonePtrOrName, class Duration>
zoned_time(TimeZonePtr, sys_time<Duration>) zoned_time(TimeZonePtrOrName, sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>, TimeZonePtr>; -> zoned_time<std::common_type_t<Duration, std::chrono::seconds>,
std::conditional_t
<
std::is_convertible<TimeZonePtrOrName, std::string_view>::value,
time_zone const*,
TimeZonePtrOrName
>>;
template <class TimeZonePtr, class Duration> template <class TimeZonePtrOrName, class Duration>
zoned_time(TimeZonePtr, local_time<Duration>, choose = choose::earliest) zoned_time(TimeZonePtrOrName, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>, TimeZonePtr>; -> zoned_time<std::common_type_t<Duration, std::chrono::seconds>,
std::conditional_t
<
std::is_convertible<TimeZonePtrOrName, std::string_view>::value,
time_zone const*,
TimeZonePtrOrName
>>;
#if HAS_STRING_VIEW template <class Duration, class TimeZonePtrOrName, class TimeZonePtr2>
zoned_time(TimeZonePtrOrName, zoned_time<Duration, TimeZonePtr2>, choose = choose::earliest)
zoned_time(std::string_view) -> zoned_time<std::common_type_t<Duration, std::chrono::seconds>,
-> zoned_time<std::chrono::seconds>; std::conditional_t
<
template <class Duration> std::is_convertible<TimeZonePtrOrName, std::string_view>::value,
zoned_time(std::string_view, sys_time<Duration>) time_zone const*,
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>; TimeZonePtrOrName
>>;
template <class Duration>
zoned_time(std::string_view, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
#else // !HAS_STRING_VIEW
zoned_time(std::string)
-> zoned_time<std::chrono::seconds>;
template <class Duration>
zoned_time(std::string, sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Duration>
zoned_time(std::string, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
#endif // !HAS_STRING_VIEW
template <class Duration>
zoned_time(const char*, sys_time<Duration>)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Duration>
zoned_time(const char*, local_time<Duration>, choose = choose::earliest)
-> zoned_time<std::common_type_t<Duration, std::chrono::seconds>>;
template <class Duration, class TimeZonePtr, class TimeZonePtr2>
zoned_time(TimeZonePtr, zoned_time<Duration, TimeZonePtr2>, choose = choose::earliest)
-> zoned_time<Duration, TimeZonePtr>;
#endif // HAS_DEDUCTION_GUIDES #endif // HAS_DEDUCTION_GUIDES
@@ -1840,9 +1828,8 @@ to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
{ {
using duration = typename zoned_time<Duration, TimeZonePtr>::duration; using duration = typename zoned_time<Duration, TimeZonePtr>::duration;
using LT = local_time<duration>; using LT = local_time<duration>;
auto const tz = tp.get_time_zone();
auto const st = tp.get_sys_time(); auto const st = tp.get_sys_time();
auto const info = tz->get_info(st); auto const info = tp.get_time_zone()->get_info(st);
return to_stream(os, fmt, LT{(st+info.offset).time_since_epoch()}, return to_stream(os, fmt, LT{(st+info.offset).time_since_epoch()},
&info.abbrev, &info.offset); &info.abbrev, &info.offset);
} }