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

🐛 fix for #586

Browse source 
Also added a Travis builder with -std=c++1z
This commit is contained in:
Niels Lohmann 2017-05-20 10:34:49 +02:00
parent 0f4131d138
commit 99cb095e89
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -177,6 +177,16 @@ matrix:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: g++-6 packages: g++-6
- os: linux
compiler: gcc
env:
- COMPILER=g++-6
- CXXFLAGS=-std=c++1z
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: g++-6
# Linux / Clang # Linux / Clang
- os: linux - os: linux

2
src/json.hpp
View file

@ -3742,7 +3742,7 @@ class basic_json
#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
#endif #endif
#if defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1 // fix for issue #464 #if (defined(__cplusplus) && __cplusplus == 201703L) || (defined(_MSC_VER) && _MSC_VER >1900 && defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
and not std::is_same<ValueType, typename std::string_view>::value and not std::is_same<ValueType, typename std::string_view>::value
#endif #endif
, int >::type = 0 > , int >::type = 0 >