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

Revert 5f34c40 and 23b1f00 in preparation of a better solution.

Browse Source 
Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2018-12-16 17:11:28 +01:00
committed by Howard Hinnant
parent 0e85704e47
commit 7231a182a4
1 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
include/date/tz.h
View File

@@ -343,13 +343,13 @@ private:
sys_time<duration> tp_; sys_time<duration> tp_;
public: public:
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = decltype(zoned_traits<T>::default_zone())> class = decltype(zoned_traits<T>::default_zone())>
#endif #endif
zoned_time(); zoned_time();
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = decltype(zoned_traits<T>::default_zone())> class = decltype(zoned_traits<T>::default_zone())>
#endif #endif
@@ -357,7 +357,6 @@ 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 > 1915)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -367,10 +366,9 @@ 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 > 1915) # 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
< <
@@ -394,7 +392,7 @@ public:
zoned_time(TimeZonePtr z, const sys_time<Duration>& st); zoned_time(TimeZonePtr z, const sys_time<Duration>& st);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -407,7 +405,7 @@ public:
#endif #endif
zoned_time(TimeZonePtr z, const local_time<Duration>& tp); zoned_time(TimeZonePtr z, const local_time<Duration>& tp);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -507,7 +505,7 @@ public:
#else // !HAS_STRING_VIEW #else // !HAS_STRING_VIEW
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -521,7 +519,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const sys_time<Duration>& st); zoned_time(const std::string& name, const sys_time<Duration>& st);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -535,7 +533,7 @@ public:
#endif #endif
zoned_time(const char* name, const sys_time<Duration>& st); zoned_time(const char* name, const sys_time<Duration>& st);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -549,7 +547,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const local_time<Duration>& tp); zoned_time(const std::string& name, const local_time<Duration>& tp);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -563,7 +561,7 @@ public:
#endif #endif
zoned_time(const char* name, const local_time<Duration>& tp); zoned_time(const char* name, const local_time<Duration>& tp);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -578,7 +576,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const local_time<Duration>& tp, choose c); zoned_time(const std::string& name, const local_time<Duration>& tp, choose c);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #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
< <
@@ -593,7 +591,7 @@ public:
#endif #endif
zoned_time(const char* name, const local_time<Duration>& tp, choose c); zoned_time(const char* name, const local_time<Duration>& tp, choose c);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr, template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -611,7 +609,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt); zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr, template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -629,7 +627,7 @@ public:
#endif #endif
zoned_time(const char* name, const zoned_time<Duration2, TimeZonePtr2>& zt); zoned_time(const char* name, const zoned_time<Duration2, TimeZonePtr2>& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr, template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -649,7 +647,7 @@ public:
zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt, zoned_time(const std::string& name, const zoned_time<Duration2, TimeZonePtr2>& zt,
choose); choose);
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr, template <class Duration2, class TimeZonePtr2, class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -1351,7 +1349,7 @@ to_raw_pointer(Pointer p) noexcept
} // namespace detail } // namespace detail
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1360,7 +1358,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time()
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1378,9 +1376,7 @@ 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 > 1915) template <class T, 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))
@@ -1389,9 +1385,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 > 1915) #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))
@@ -1415,7 +1411,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const sys_time<Dura
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1425,7 +1421,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Du
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1455,7 +1451,7 @@ 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>
template <class, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const sys_time<Duration>& st) const sys_time<Duration>& st)
@@ -1463,7 +1459,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
template <class, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const local_time<Duration>& t) const local_time<Duration>& t)
@@ -1471,7 +1467,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
template <class, class> template <class T, class>
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name, zoned_time<Duration, TimeZonePtr>::zoned_time(std::string_view name,
const local_time<Duration>& t, choose c) const local_time<Duration>& t, choose c)
@@ -1498,7 +1494,7 @@ 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 > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1508,7 +1504,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1518,7 +1514,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1528,7 +1524,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1538,7 +1534,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1548,7 +1544,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class T, class> template <class T, class>
#endif #endif
inline inline
@@ -1558,7 +1554,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class, class> template <class Duration2, class TimeZonePtr2, class, class>
#else #else
template <class Duration2, class TimeZonePtr2> template <class Duration2, class TimeZonePtr2>
@@ -1570,7 +1566,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class, class> template <class Duration2, class TimeZonePtr2, class, class>
#else #else
template <class Duration2, class TimeZonePtr2> template <class Duration2, class TimeZonePtr2>
@@ -1582,7 +1578,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class, class> template <class Duration2, class TimeZonePtr2, class, class>
#else #else
template <class Duration2, class TimeZonePtr2> template <class Duration2, class TimeZonePtr2>
@@ -1595,7 +1591,7 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const std::string& name,
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class Duration2, class TimeZonePtr2, class, class> template <class Duration2, class TimeZonePtr2, class, class>
#else #else
template <class Duration2, class TimeZonePtr2> template <class Duration2, class TimeZonePtr2>
@@ -1691,7 +1687,7 @@ make_zoned(const sys_time<Duration>& tp)
} }
template <class TimeZonePtr template <class TimeZonePtr
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
, class = typename std::enable_if , class = typename std::enable_if
< <
std::is_class std::is_class
@@ -1719,7 +1715,7 @@ make_zoned(const std::string& name)
} }
template <class Duration, class TimeZonePtr template <class Duration, class TimeZonePtr
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
, class = typename std::enable_if , class = typename std::enable_if
< <
std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{} std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{}
@@ -1735,7 +1731,7 @@ make_zoned(TimeZonePtr zone, const local_time<Duration>& tp)
} }
template <class Duration, class TimeZonePtr template <class Duration, class TimeZonePtr
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
, class = typename std::enable_if , class = typename std::enable_if
< <
std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{} std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{}
@@ -1801,7 +1797,7 @@ make_zoned(const std::string& name, const zoned_time<Duration, TimeZonePtr>& zt,
} }
template <class Duration, class TimeZonePtr template <class Duration, class TimeZonePtr
#if !defined(_MSC_VER) || (_MSC_VER > 1915) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
, class = typename std::enable_if , class = typename std::enable_if
< <
std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{} std::is_class<typename std::decay<decltype(*std::declval<TimeZonePtr&>())>::type>{}