amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-04 08:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ do not include experimental headers

Browse Source
This commit is contained in:
Niels Lohmann
2021-01-03 20:10:43 +01:00
parent ebb63bd1fa
commit f1913fe7a9
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,11 +32,7 @@
#endif
#ifdef JSON_HAS_CPP_17
#if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#include <optional>
#endif
// disable float-equal warnings on GCC/clang

6
single_include/nlohmann/json.hpp
View File

@@ -2109,11 +2109,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
#endif
#ifdef JSON_HAS_CPP_17
#if __has_include(<optional>)
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#include <optional>
#endif
// disable float-equal warnings on GCC/clang