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

Merge branch 'develop' into feature/insert

Browse source
This commit is contained in:
Niels Lohmann 2017-04-12 18:01:06 +02:00
commit d4469233ac
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
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

3
src/json.hpp.re2c
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