From f7075be93aca14537a80acdeae6b70b5bde01e12 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 20 Feb 2017 18:15:50 +0100 Subject: [PATCH] :bug: reverted change for #464 --- src/json.hpp | 1 - src/json.hpp.re2c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index ae847adc..6be6a6d9 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3487,7 +3487,6 @@ 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 - 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 64b1e5dd..82673171 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -3487,7 +3487,6 @@ 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 - and not std::is_same::value #endif , int >::type = 0 > operator ValueType() const