j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🏁 another fix for MSVC #464

Browse source 
needed for VS2015.3 with /std:c++latest
This commit is contained in:
Niels Lohmann 2017-04-23 20:51:29 +02:00
parent 4b316ec528
commit 2df8f12c09
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -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) && _HAS_CXX17 == 1 // fix for issue #464
#if defined(_MSC_VER) && _MSC_VER >1900 && 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 >

2
src/json.hpp.re2c
View file

@ -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) && _HAS_CXX17 == 1 // fix for issue #464
#if defined(_MSC_VER) && _MSC_VER >1900 && 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 >