summaryrefslogtreecommitdiffstats
path: root/libcxx/src/optional.cpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-12 06:48:31 +0000
committerEric Fiselier <eric@efcs.ca>2016-10-12 06:48:31 +0000
commitfc647db3ee8215ab2fa5f7cdea8d327c2faa768f (patch)
treee81dc360c9c06b9a32303243d77c4c7325f8897f /libcxx/src/optional.cpp
parent6ee4001cc957acac39181b68193e1414c3163698 (diff)
downloadbcm5719-llvm-fc647db3ee8215ab2fa5f7cdea8d327c2faa768f.tar.gz
bcm5719-llvm-fc647db3ee8215ab2fa5f7cdea8d327c2faa768f.zip
Revert Add <optional>. Will recommit with better commit message
llvm-svn: 283978
Diffstat (limited to 'libcxx/src/optional.cpp')
-rw-r--r--libcxx/src/optional.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp
index f2fbfdfec1c..8c5dd76d86d 100644
--- a/libcxx/src/optional.cpp
+++ b/libcxx/src/optional.cpp
@@ -7,18 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#include "optional"
#include "experimental/optional"
-namespace std
-{
+_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
-bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
+#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-} // std
+bad_optional_access::~bad_optional_access() _NOEXCEPT {}
-_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
+#else
bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
+#endif
+
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
OpenPOWER on IntegriCloud