🐛 fix for #464

f2dfa09a · Niels Lohmann · 83a9c60d · f2dfa09a · f2dfa09a
Unverified Commit f2dfa09a authored Feb 20, 2017 by Niels Lohmann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/json.hpp src/json.hpp +1 -0

src/json.hpp.re2c src/json.hpp.re2c +1 -0

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -3487,6 +3487,7 @@ 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
+                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
                   , int >::type = 0 >
    operator ValueType() const

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