From eb50fbf926e7688f43770c540eafeb6b877cbe0a Mon Sep 17 00:00:00 2001 From: chenguoping Date: Tue, 26 May 2020 16:43:16 +0800 Subject: [PATCH] fix issue 2112 --- include/nlohmann/json.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 2195dcb4..38769c36 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3207,7 +3207,7 @@ class basic_json not std::is_same::value and not detail::is_basic_json::value and not std::is_same>::value -#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914)) +#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER >= 1910 and _MSC_VER <= 1914)) and not std::is_same::value #endif and detail::is_detected::value diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index bf10cae2..9bb94494 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -18999,7 +18999,7 @@ class basic_json not std::is_same::value and not detail::is_basic_json::value and not std::is_same>::value -#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914)) +#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER >= 1910 and _MSC_VER <= 1914)) and not std::is_same::value #endif and detail::is_detected::value