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

⏪ undo cleanup

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

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

@ -51,11 +51,11 @@
#define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
#endif
//// std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
//#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
// #undef JSON_HAS_FILESYSTEM
// #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
//#endif
// std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_HAS_FILESYSTEM
#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
#endif
#endif
#endif

10
single_include/nlohmann/json.hpp
View File

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

6
test/CMakeLists.txt
View File

@ -59,9 +59,9 @@ foreach(feature ${CMAKE_CXX_COMPILE_FEATURES})
endif()
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()
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)

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

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