From f2dfa09aecf672a3b9980613bde196a5cb1ef994 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 20 Feb 2017 18:05:52 +0100 Subject: [PATCH] :bug: fix for #464 --- src/json.hpp | 1 + src/json.hpp.re2c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/json.hpp b/src/json.hpp index 6be6a6d9e..ae847adc4 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -3487,6 +3487,7 @@ 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 826731714..64b1e5ddb 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -3487,6 +3487,7 @@ 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