summaryrefslogtreecommitdiffstats
path: root/libcxx/src/optional.cpp
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-11-15 22:42:10 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-11-15 22:42:10 +0000
commitdfdac03c8fcd6165795bf8dbce3384ec442ee3d1 (patch)
treef8a767bbb9f4231c09711442de9c05b297b7a9ab /libcxx/src/optional.cpp
parent3f823e3af17a0192fc7da4b3d071815c72858a6b (diff)
downloadbcm5719-llvm-dfdac03c8fcd6165795bf8dbce3384ec442ee3d1.tar.gz
bcm5719-llvm-dfdac03c8fcd6165795bf8dbce3384ec442ee3d1.zip
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
Diffstat (limited to 'libcxx/src/optional.cpp')
-rw-r--r--libcxx/src/optional.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp
index fde071c9a13..b614d811612 100644
--- a/libcxx/src/optional.cpp
+++ b/libcxx/src/optional.cpp
@@ -7,10 +7,10 @@
//
//===----------------------------------------------------------------------===//
-#include "optional"
+#include "experimental/optional"
namespace std // purposefully not using versioning namespace
-{
+{ namespace experimental {
#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
@@ -22,4 +22,4 @@ bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
#endif
-} // std
+}} // std::experimental
OpenPOWER on IntegriCloud