wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-10 16:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2176 from gracicot/cpp20-support-no-std-fct-templ-specialization

Browse Source 
C++20 support by removing swap specialization
This commit is contained in:
Niels Lohmann authored and GitHub committed 2020-06-21 20:39:58 +02:00
2 parents 8dade80499 82fbbeeac5
commit 29ad2178c6
5 files changed
+80 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/macro_scope.hpp
+5 -1
View File
@@ -20,7 +20,11 @@
#endif
// C++ language standard detection
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
#define JSON_HAS_CPP_20
#define JSON_HAS_CPP_17
#define JSON_HAS_CPP_14
#elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
#define JSON_HAS_CPP_17
#define JSON_HAS_CPP_14
#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)