lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-22 15:21:52 +03:00
Code Activity

Merge branch 'develop' into feature/insert

Browse Source
This commit is contained in:
Niels Lohmann
2017-04-12 18:01:06 +02:00
parent 97a25de938 42b4cdd4d0
commit d4469233ac
5 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/json.hpp
View File

@ -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) && _HAS_CXX17 == 1 // fix for issue #464
and not std::is_same<ValueType, typename std::string_view>::value
#endif
, int >::type = 0 >
operator ValueType() const