mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-06-13 13:10:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed amalgamation file

Browse Source
This commit is contained in:
David Pfahler 2021-04-26 08:39:24 +02:00
parent 5a77314c5e
commit d140a1c777
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
single_include/nlohmann/json.hpp
View File

@ -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
#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