Drop <experimental/optional>

nlohmann · Jan 2, 2021 · 381bbe3 · 381bbe3
1 parent eb348f0
commit 381bbe3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp
@@ -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

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -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