From f1913fe7a92283b2a8edf2138ce522b4a46a6dd5 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sun, 3 Jan 2021 20:10:43 +0100
Subject: [PATCH] :recycle: do not include experimental headers

---
 include/nlohmann/detail/macro_scope.hpp | 6 +-----
 single_include/nlohmann/json.hpp        | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp
index b14f35e04..412858eeb 100644
--- 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
index 05262b84c..897d6b682 100644
--- 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