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

Merge pull request #1028 from gracicot/develop

Browse source 
Added support for string_view in C++17
This commit is contained in:
Niels Lohmann 2018-06-23 17:10:04 +02:00 • committed by GitHub
commit bf348ca8a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 152 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/json.hpp
View file

@ -2829,9 +2829,9 @@ class basic_json
not detail::is_basic_json<ValueType>::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(JSON_HAS_CPP_17)
#if defined(JSON_HAS_CPP_17) && _MSC_VER <= 1914
and not std::is_same<ValueType, typename std::string_view>::value
#endif
#endif
, int >::type = 0 >
operator ValueType() const