External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚗️ do not use too old compilers with C++17

Browse Source
This commit is contained in:
Niels Lohmann 2021-10-20 15:18:00 +02:00
parent 5cd67e7d23
commit 12bb88871e
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/macro_scope.hpp
View File

@ -54,7 +54,7 @@
#endif #endif
// std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
#if __MINGW32__ && __GNUC__ == 8 #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_STD_FILESYSTEM_EXPERIMENTAL #undef JSON_STD_FILESYSTEM_EXPERIMENTAL
#endif #endif
#endif #endif

2
single_include/nlohmann/json.hpp
View File

@ -2342,7 +2342,7 @@ using is_detected_convertible =
#endif #endif
// std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
#if __MINGW32__ && __GNUC__ == 8 #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_STD_FILESYSTEM_EXPERIMENTAL #undef JSON_STD_FILESYSTEM_EXPERIMENTAL
#endif #endif
#endif #endif

4
test/CMakeLists.txt
View File

@ -58,6 +58,10 @@ foreach(feature ${CMAKE_CXX_COMPILE_FEATURES})
set(compiler_supports_cpp_17 TRUE) set(compiler_supports_cpp_17 TRUE)
endif() endif()
endforeach() endforeach()
# Clang only supports C++17 starting from Clang 5.0
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
unset(compiler_supports_cpp_17)
endif()
file(GLOB files src/unit-*.cpp) file(GLOB files src/unit-*.cpp)

2
test/src/unit-regression2.cpp
View File

@ -64,7 +64,7 @@ using ordered_json = nlohmann::ordered_json;
#define JSON_STD_FILESYSTEM_EXPERIMENTAL 0 #define JSON_STD_FILESYSTEM_EXPERIMENTAL 0
// std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
#if __MINGW32__ && __GNUC__ == 8 #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_STD_FILESYSTEM_EXPERIMENTAL #undef JSON_STD_FILESYSTEM_EXPERIMENTAL
#endif #endif
#endif #endif