msvc token workaround

This commit is contained in:
Alexander Karatarakis 2017-11-17 14:57:39 -08:00 committed by Howard Hinnant
parent 16439a8ce2
commit bd51baf31e

View File

@ -342,13 +342,13 @@ private:
sys_time<duration> tp_; sys_time<duration> tp_;
public: public:
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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 > 1911) #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
@ -367,7 +367,7 @@ public:
>::type> >::type>
explicit zoned_time(std::string_view name); explicit zoned_time(std::string_view name);
#else #else
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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
< <
@ -391,7 +391,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 > 1911) #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
< <
@ -404,7 +404,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 > 1911) #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
< <
@ -500,7 +500,7 @@ public:
#else // !HAS_STRING_VIEW #else // !HAS_STRING_VIEW
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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
< <
@ -514,7 +514,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 > 1911) #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
< <
@ -528,7 +528,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 > 1911) #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
< <
@ -542,7 +542,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 > 1911) #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
< <
@ -556,7 +556,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 > 1911) #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
< <
@ -571,7 +571,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 > 1911) #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
< <
@ -586,7 +586,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 > 1911) #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
< <
@ -600,7 +600,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const zoned_time& zt); zoned_time(const std::string& name, const zoned_time& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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
< <
@ -614,7 +614,7 @@ public:
#endif #endif
zoned_time(const char* name, const zoned_time& zt); zoned_time(const char* name, const zoned_time& zt);
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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
< <
@ -629,7 +629,7 @@ public:
#endif #endif
zoned_time(const std::string& name, const zoned_time& zt, choose); zoned_time(const std::string& name, const zoned_time& zt, choose);
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #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
< <
@ -1342,8 +1342,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time() zoned_time<Duration, TimeZonePtr>::zoned_time()
@ -1351,8 +1351,8 @@ zoned_time<Duration, TimeZonePtr>::zoned_time()
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const sys_time<Duration>& st) zoned_time<Duration, TimeZonePtr>::zoned_time(const sys_time<Duration>& st)
@ -1378,8 +1378,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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)
@ -1404,8 +1404,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t) zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t)
@ -1414,8 +1414,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t, zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t,
@ -1485,8 +1485,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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,
@ -1495,8 +1495,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
@ -1505,8 +1505,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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,
@ -1515,8 +1515,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
@ -1525,8 +1525,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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,
@ -1535,8 +1535,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,
@ -1545,8 +1545,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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,
@ -1555,8 +1555,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, const zoned_time& zt) zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, const zoned_time& zt)
@ -1564,8 +1564,8 @@ zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, const zoned_time
{} {}
template <class Duration, class TimeZonePtr> template <class Duration, class TimeZonePtr>
#if !defined(_MSC_VER) || (_MSC_VER > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, 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,
@ -1574,8 +1574,8 @@ 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 > 1911) #if !defined(_MSC_VER) || (_MSC_VER > 1900)
template <class, class> template <class T, class>
#endif #endif
inline inline
zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name, zoned_time<Duration, TimeZonePtr>::zoned_time(const char* name,