From 41563c46e870accd7adc97b9627f5f00e9dcd6b2 Mon Sep 17 00:00:00 2001
From: Kiryl Mikhneev <kmikhneev@corp.finam.ru>
Date: Thu, 31 Aug 2017 14:11:59 +0300
Subject: [PATCH] Disabled some template constraints for vs since it does not
 work properly there

---
 tz.cpp | 2 +-
 tz.h   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tz.cpp b/tz.cpp
index f5bf98e..c68edb2 100644
--- a/tz.cpp
+++ b/tz.cpp
@@ -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
diff --git a/tz.h b/tz.h
index 2476cc4..3008580 100644
--- a/tz.h
+++ b/tz.h
@@ -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)