Remove <experimental/optional>; use <optional> instead. See https://l…

…ibcxx.llvm.org/TS_deprecation.html git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@323971 91177308-0d34-0410-b5e6-96231b3b80d8
llvm-mirror · Feb 1, 2018 · 95db3d2 · 95db3d2
1 parent 75075c6
commit 95db3d2
Show file tree

Hide file tree

Showing 72 changed files with 1 addition and 5,262 deletions.
diff --git a/include/experimental/optional b/include/experimental/optional
diff --git a/include/module.modulemap b/include/module.modulemap
@@ -546,10 +546,6 @@ module std [system] {
       header "experimental/numeric"
       export *
     }
-    module optional {
-      header "experimental/optional"
-      export *
-    }
     module propagate_const {
       header "experimental/propagate_const"
       export *

diff --git a/src/optional.cpp b/src/optional.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "optional"
-#include "experimental/optional"
 
 namespace std
 {
@@ -21,8 +20,3 @@ const char* bad_optional_access::what() const _NOEXCEPT {
 
 } // std
 
-_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
-
-bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
-
-_LIBCPP_END_NAMESPACE_EXPERIMENTAL
diff --git a/test/libcxx/double_include.sh.cpp b/test/libcxx/double_include.sh.cpp
@@ -150,7 +150,6 @@
 #include <experimental/map>
 #include <experimental/memory_resource>
 #include <experimental/numeric>
-#include <experimental/optional>
 #include <experimental/propagate_const>
 #include <experimental/ratio>
 #include <experimental/regex>

diff --git a/test/libcxx/experimental/optional/version.pass.cpp b/test/libcxx/experimental/optional/version.pass.cpp
diff --git a/test/libcxx/min_max_macros.sh.cpp b/test/libcxx/min_max_macros.sh.cpp
@@ -261,8 +261,6 @@ TEST_MACROS();
 TEST_MACROS();
 #include <experimental/numeric>
 TEST_MACROS();
-#include <experimental/optional>
-TEST_MACROS();
 #include <experimental/propagate_const>
 TEST_MACROS();
 #include <experimental/ratio>

diff --git a/test/std/experimental/optional/optional.bad_optional_access/default.pass.cpp b/test/std/experimental/optional/optional.bad_optional_access/default.pass.cpp
diff --git a/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp b/test/std/experimental/optional/optional.bad_optional_access/derive.pass.cpp
diff --git a/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp b/test/std/experimental/optional/optional.comp_with_t/equal.pass.cpp
diff --git a/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp b/test/std/experimental/optional/optional.comp_with_t/greater.pass.cpp
diff --git a/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp b/test/std/experimental/optional/optional.comp_with_t/greater_equal.pass.cpp
diff --git a/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp b/test/std/experimental/optional/optional.comp_with_t/less_equal.pass.cpp