Skip to content

J
json
Unverified Commit f1913fe7 by Niels Lohmann
Options

♻ do not include experimental headers

parent ebb63bd1
Showing with 2 additions and 10 deletions
include/nlohmann/detail/macro_scope.hpp
...@@ -32,11 +32,7 @@ ...@@ -32,11 +32,7 @@
#endif #endif
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#if __has_include(<optional>) #include <optional>
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
// disable float-equal warnings on GCC/clang // disable float-equal warnings on GCC/clang
......
single_include/nlohmann/json.hpp
...@@ -2109,11 +2109,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP ...@@ -2109,11 +2109,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
#endif #endif
#ifdef JSON_HAS_CPP_17 #ifdef JSON_HAS_CPP_17
#if __has_include(<optional>) #include <optional>
#include <optional>
#elif __has_include(<experimental/optional>)
#include <experimental/optional>
#endif
#endif #endif
// disable float-equal warnings on GCC/clang // disable float-equal warnings on GCC/clang
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment