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

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

2
tz.cpp
View File

@ -142,7 +142,7 @@
#if HAS_REMOTE_API
// Note curl includes windows.h so we must include curl AFTER definitions of things
// 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
# include <curl.h>
#else

8
tz.h
View File

@ -412,6 +412,7 @@ public:
zoned_time(TimeZonePtr z, const sys_time<Duration>& st);
#if !defined(_MSC_VER) || (_MSC_VER > 1911)
template <class T = TimeZonePtr,
class = typename std::enable_if
<
@ -421,8 +422,10 @@ public:
sys_time<duration>
>::value
>::type>
#endif
zoned_time(TimeZonePtr z, const local_time<Duration>& tp);
#if !defined(_MSC_VER) || (_MSC_VER > 1911)
template <class T = TimeZonePtr,
class = typename std::enable_if
<
@ -433,6 +436,7 @@ public:
sys_time<duration>
>::value
>::type>
#endif
zoned_time(TimeZonePtr z, const local_time<Duration>& tp, choose c);
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>
#if !defined(_MSC_VER) || (_MSC_VER > 1911)
template <class, class>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t)
: 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>
#if !defined(_MSC_VER) || (_MSC_VER > 1911)
template <class, class>
#endif
inline
zoned_time<Duration, TimeZonePtr>::zoned_time(TimeZonePtr z, const local_time<Duration>& t,
choose c)