j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Disable std::swap specialization in C++20 and added a friend swap function

Browse source
This commit is contained in:
Guillaume Racicot 2020-06-06 11:36:39 -04:00
parent 7444c7fa25
commit 225c8f150a
3 changed files with 76 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/nlohmann/detail/macro_scope.hpp
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)