From 628be157a27f71b4f045fc687d723f9e1bbdfc51 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 9 Apr 2017 13:52:04 +0200 Subject: [PATCH] :bug: added fix for #464 --- src/json.hpp | 3 +++ src/json.hpp.re2c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/json.hpp b/src/json.hpp index 98659054..bdbd351b 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3729,6 +3729,9 @@ class basic_json not std::is_same::value #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 and not std::is_same>::value +#endif +#if defined(_MSC_VER) && defined(_HAS_CXX17) // fix for issue #464 + and not std::is_same::value #endif , int >::type = 0 > operator ValueType() const diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 5e90f611..6710233c 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -3729,6 +3729,9 @@ class basic_json not std::is_same::value #ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015 and not std::is_same>::value +#endif +#if defined(_MSC_VER) && defined(_HAS_CXX17) // fix for issue #464 + and not std::is_same::value #endif , int >::type = 0 > operator ValueType() const