lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-16 18:41:53 +03:00
Code 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
2 changed files with 0 additions and 2 deletions
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