lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-19 17:03:16 +03:00
Code Activity

generate amalgation to fix CI for #2730

Browse Source
This commit is contained in:
David Pfahler
2021-04-21 12:46:37 +02:00
parent 31c4c8f36c
commit 38952643c5
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
single_include/nlohmann/json.hpp
View File

@ -2229,6 +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
#ifndef JSON_VERSION_IS_PREDEFINED
#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
@ -2239,6 +2241,7 @@ 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
#endif
// disable documentation warnings on clang // disable documentation warnings on clang
#if defined(__clang__) #if defined(__clang__)