From 25a5d891c3b69ef0a1b1a6d4196cc01d4b2df02a Mon Sep 17 00:00:00 2001 From: David Acevedo Date: Tue, 2 Mar 2021 07:43:05 +0100 Subject: [PATCH] Revert "Needed for compiling With Embarcadero C++Builder 10.3, and probably with others." This reverts commit f2f5ce866ba4b0286b5d6ec7f595b5c0d6989381. --- include/json/config.h | 2 +- src/lib_json/json_value.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/json/config.h b/include/json/config.h index ad55a4d..7f9ac69 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -80,8 +80,8 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size, // These Macros are maintained for backwards compatibility of external tools. #if (defined(_MSC_VER) && _MSC_VER >= 1900) || \ (defined(__GNUC__) && __cplusplus >= 201103L) || \ + (defined(__clang__) && __clang_major__ == 3 && __clang_minor__ >= 3) - (defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 3))) #define JSONCPP_CXX_STD_11 1 #else #define JSONCPP_CXX_STD_11 0 diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 2219b9c..2938ea5 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -16,7 +16,6 @@ #include #include #include -#include // Provide implementation equivalent of std::snprintf for older _MSC compilers #if defined(_MSC_VER) && _MSC_VER < 1900