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

🔨 cleanup

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

2
cmake/download_test_data.cmake
View File

@ -53,4 +53,4 @@ else()
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE CXX_VERSION_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE CXX_VERSION_RESULT OUTPUT_STRIP_TRAILING_WHITESPACE)
endif() endif()
string(REGEX REPLACE "[ ]*\n" "; " CXX_VERSION_RESULT "${CXX_VERSION_RESULT}") string(REGEX REPLACE "[ ]*\n" "; " CXX_VERSION_RESULT "${CXX_VERSION_RESULT}")
message(STATUS "Compiler: ${CXX_VERSION_RESULT}, ${CMAKE_CXX_COMPILE_FEATURES}") message(STATUS "Compiler: ${CXX_VERSION_RESULT}")

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

@ -51,11 +51,11 @@
#define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
#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 defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 //#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_HAS_FILESYSTEM // #undef JSON_HAS_FILESYSTEM
#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM // #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
#endif //#endif
#endif #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 #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
#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 defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 //#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_HAS_FILESYSTEM // #undef JSON_HAS_FILESYSTEM
#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM // #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
#endif //#endif
#endif #endif
#endif #endif

6
test/CMakeLists.txt
View File

@ -59,9 +59,9 @@ foreach(feature ${CMAKE_CXX_COMPILE_FEATURES})
endif() endif()
endforeach() endforeach()
# Clang only supports C++17 starting from Clang 5.0 # 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) #if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
unset(compiler_supports_cpp_17) # unset(compiler_supports_cpp_17)
endif() #endif()
file(GLOB files src/unit-*.cpp) 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 #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
#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 defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 //#if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
#undef JSON_HAS_FILESYSTEM // #undef JSON_HAS_FILESYSTEM
#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM // #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
#endif //#endif
#endif #endif
#endif #endif