From e48114bbd6625e6199baa10cbfe783bb95c32604 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sun, 9 Apr 2017 14:02:04 +0200
Subject: [PATCH] :hammer: check for value of _HAS_CXX17

---
 src/json.hpp      | 2 +-
 src/json.hpp.re2c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/json.hpp b/src/json.hpp
index bdbd351b..3b8925a3 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -3730,7 +3730,7 @@ class basic_json
 #ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                    and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
 #endif
-#if defined(_MSC_VER) && defined(_HAS_CXX17) // fix for issue #464
+#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464
                    and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                    , int >::type = 0 >
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index 6710233c..eca19ccf 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -3730,7 +3730,7 @@ class basic_json
 #ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                    and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
 #endif
-#if defined(_MSC_VER) && defined(_HAS_CXX17) // fix for issue #464
+#if defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464
                    and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                    , int >::type = 0 >