From fc647db3ee8215ab2fa5f7cdea8d327c2faa768f Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 12 Oct 2016 06:48:31 +0000
Subject: Revert Add <optional>. Will recommit with better commit message

llvm-svn: 283978
---
 libcxx/src/optional.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libcxx/src/optional.cpp')

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
-- 
cgit v1.2.3