3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2025-01-14 01:37:57 +08:00
Code Issues Projects Releases Wiki Activity

Patch for VS-2017 compatiblity

Browse Source
This commit is contained in:
Howard Hinnant 2018-11-25 14:38:54 -05:00
parent a22125ca40
commit 23b1f007fe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/date/tz.h
View File

@ -357,6 +357,7 @@ public:
explicit zoned_time(TimeZonePtr z); explicit zoned_time(TimeZonePtr z);
#if HAS_STRING_VIEW #if HAS_STRING_VIEW
# if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@ -366,9 +367,10 @@ public:
decltype(zoned_traits<T>::locate_zone(std::string_view())) decltype(zoned_traits<T>::locate_zone(std::string_view()))
>::value >::value
>::type> >::type>
# endif
explicit zoned_time(std::string_view name); explicit zoned_time(std::string_view name);
#else #else
#if !defined(_MSC_VER) || (_MSC_VER > 1900) # if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@ -378,7 +380,7 @@ public:
decltype(zoned_traits<T>::locate_zone(std::string())) decltype(zoned_traits<T>::locate_zone(std::string()))
>::value >::value
>::type> >::type>
#endif # endif
explicit zoned_time(const std::string& name); explicit zoned_time(const std::string& name);
#endif #endif
@ -1376,7 +1378,9 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z)
#if HAS_STRING_VIEW #if HAS_STRING_VIEW
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
# if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class, class>
# endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name) zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name)) : zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name))
@ -1385,9 +1389,9 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name)
#else // !HAS_STRING_VIEW #else // !HAS_STRING_VIEW
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1900) # if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif # endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name) zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name)
: zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name)) : zoned_time(zoned_traits<TimeZonePtr>::locate_zone(name))