diff --git a/.travis.yml b/.travis.yml index 0d7026b0a..089524f4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -177,6 +177,16 @@ matrix: sources: ['ubuntu-toolchain-r-test'] 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 - os: linux diff --git a/src/json.hpp b/src/json.hpp index 85d559d7a..7bfb73597 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3742,7 +3742,7 @@ class basic_json #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 and not std::is_same>::value #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::value #endif , int >::type = 0 >