Skip to content

J
json
Commit d140a1c7 authored by David Pfahler's avatar David Pfahler
Browse files
Options

fixed amalgamation file

parent 5a77314c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
single_include/nlohmann/json.hpp
View file @ d140a1c7
...@@ -2229,8 +2229,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP ...@@ -2229,8 +2229,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP
#endif #endif
// C++ language standard detection // C++ language standard detection
// if the user wants to manually specify the used c++ version this is skipped // if the user manually specified the used c++ version this is skipped
#ifndef JSON_VERSION_IS_PREDEFINED #if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
#define JSON_HAS_CPP_20 #define JSON_HAS_CPP_20
#define JSON_HAS_CPP_17 #define JSON_HAS_CPP_17
...@@ -2241,6 +2241,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP ...@@ -2241,6 +2241,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP
#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
#define JSON_HAS_CPP_14 #define JSON_HAS_CPP_14
#endif #endif
// the cpp 11 flag is always specified because it is the minimal required version
#define JSON_HAS_CPP_11
#endif #endif
// disable documentation warnings on clang // disable documentation warnings on clang
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment