diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-10-12 06:48:31 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-10-12 06:48:31 +0000 |
| commit | ead5d404cc81f468af434f5e567c5b917d9a1cfe (patch) | |
| tree | f32d37a2dd8c9fdef7a0fdb9c772058b3f0d0851 /src/optional.cpp | |
| parent | fbc80168bb6368afdf8d21f4d21f0376fa941253 (diff) | |
| download | external_libcxx-ead5d404cc81f468af434f5e567c5b917d9a1cfe.tar.gz external_libcxx-ead5d404cc81f468af434f5e567c5b917d9a1cfe.tar.bz2 external_libcxx-ead5d404cc81f468af434f5e567c5b917d9a1cfe.zip | |
Revert Add <optional>. Will recommit with better commit message
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@283978 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src/optional.cpp')
| -rw-r--r-- | src/optional.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/optional.cpp b/src/optional.cpp index f2fbfdfec..8c5dd76d8 100644 --- a/src/optional.cpp +++ b/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 |