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

🐛 reverted change for #464

Browse source
This commit is contained in:
Niels Lohmann 2017-02-20 18:15:50 +01:00
parent f2dfa09aec
commit f7075be93a
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/json.hpp
View file

@ -3487,7 +3487,6 @@ class basic_json
not std::is_same<ValueType, typename string_t::value_type>::value not std::is_same<ValueType, typename string_t::value_type>::value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 #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 and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
and not std::is_same<ValueType, typename std::string_view>::value
#endif #endif
, int >::type = 0 > , int >::type = 0 >
operator ValueType() const operator ValueType() const

1
src/json.hpp.re2c
View file

@ -3487,7 +3487,6 @@ class basic_json
not std::is_same<ValueType, typename string_t::value_type>::value not std::is_same<ValueType, typename string_t::value_type>::value
#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 #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 and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
and not std::is_same<ValueType, typename std::string_view>::value
#endif #endif
, int >::type = 0 > , int >::type = 0 >
operator ValueType() const operator ValueType() const