Move <optional> into include/experimental, and into the std::experimental namespace, since it's not part of C++14, but of an upcoming TS

llvm-svn: 194867

1 files changed, 4 insertions, 2 deletions

diff --git a/libcxx/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/libcxx/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
index e8bb1dcda19..808537608eb 100644
--- a/libcxx/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -12,10 +12,12 @@
 // template <class T> constexpr bool operator<(const optional<T>& x, const T& v);
 // template <class T> constexpr bool operator<(const T& v, const optional<T>& x);
 
-#include <optional>
+#include <experimental/optional>
 
 #if _LIBCPP_STD_VER > 11
 
+using std::experimental::optional;
+
 struct X
 {
     int i_;
@@ -34,7 +36,7 @@ int main()
 
     {
     typedef X T;
-    typedef std::optional<T> O;
+    typedef optional<T> O;
     
     constexpr T val(2);
     constexpr O o1;     // disengaged