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

Disabled some template constraints for vs since it does not work properly there

Browse Source
This commit is contained in:
Kiryl Mikhneev
2017-08-31 14:11:59 +03:00
committed by Howard Hinnant
parent bba9aeafab
commit 41563c46e8
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tz.cpp
View File

@@ -142,7 +142,7 @@
#if HAS_REMOTE_API #if HAS_REMOTE_API
// Note curl includes windows.h so we must include curl AFTER definitions of things // Note curl includes windows.h so we must include curl AFTER definitions of things
// that effect windows.h such as NOMINMAX. // that effect windows.h such as NOMINMAX.
#if defined(_MSC_BUILD) && defined(SHORTENED_CURL_INCLUDE) #if defined(_MSC_VER) && defined(SHORTENED_CURL_INCLUDE)
// For rmt_curl nuget package // For rmt_curl nuget package
# include <curl.h> # include <curl.h>
#else #else

8
tz.h
View File

@@ -412,6 +412,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)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -421,8 +422,10 @@ public:
sys_time<duration> sys_time<duration>
>::value >::value
>::type> >::type>
#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)
template <class T = TimeZonePtr, template <class T = TimeZonePtr,
class = typename std::enable_if class = typename std::enable_if
< <
@@ -433,6 +436,7 @@ public:
sys_time<duration> sys_time<duration>
>::value >::value
>::type> >::type>
#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); zoned_time(TimeZonePtr z, const zoned_time& zt);
@@ -1408,7 +1412,9 @@ 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)
template <class, class> template <class, class>
#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)
: zone_(std::move(z)) : zone_(std::move(z))
@@ -1416,7 +1422,9 @@ 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)
template <class, class> template <class, class>
#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,
choose c) choose c)