Skip to content

J
json
Commit 4778c02a authored by Guillaume Racicot's avatar Guillaume Racicot
Browse files
Options

Set MSVC version from 1514 and older

parent 714c5926
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/nlohmann/json.hpp
View file @ 4778c02a
......@@ -2821,7 +2821,7 @@ class basic_json
not detail::is_basic_json<ValueType>::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
#if defined(JSON_HAS_CPP_17) && _MSC_VER <= 1913
#if defined(JSON_HAS_CPP_17) && _MSC_VER <= 1914
and not std::is_same<ValueType, typename std::string_view>::value
#endif
#endif
......
single_include/nlohmann/json.hpp
View file @ 4778c02a
......@@ -12470,7 +12470,7 @@ class basic_json
not detail::is_basic_json<ValueType>::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
#if defined(JSON_HAS_CPP_17) && _MSC_VER <= 1913
#if defined(JSON_HAS_CPP_17) && _MSC_VER <= 1914
and not std::is_same<ValueType, typename std::string_view>::value
#endif
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment