wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-23 11:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/manual_lexer

Browse Source
This commit is contained in:
Niels Lohmann committed 2017-05-05 16:48:47 +02:00
2 parents 8b9f51179e ecf895f2d1
commit dbcb032f22
3 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+1 -1
View File
@@ -3740,7 +3740,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 >