🐛 added fix for #464

nlohmann · Apr 9, 2017 · 628be15 · 628be15
1 parent c40c8ac
commit 628be15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/json.hpp b/src/json.hpp
@@ -3729,6 +3729,9 @@ class basic_json
                    not std::is_same<ValueType, typename string_t::value_type>::value
 #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
+                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                    , int >::type = 0 >
     operator ValueType() const

diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
@@ -3729,6 +3729,9 @@ class basic_json
                    not std::is_same<ValueType, typename string_t::value_type>::value
 #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
+                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                    , int >::type = 0 >
     operator ValueType() const