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

Merge branch 'develop' into feature/manual_lexer

Browse source
This commit is contained in:
Niels Lohmann 2017-04-12 18:07:25 +02:00
commit 2d2b98a50a
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
4 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/json.hpp
View file

@ -3739,6 +3739,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