diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-10-12 06:45:11 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-10-12 06:45:11 +0000 |
| commit | 6ee4001cc957acac39181b68193e1414c3163698 (patch) | |
| tree | 6f4a8a05e89e454e08b4385f522b0d84b9e64d7a /libcxx/src/optional.cpp | |
| parent | 49a278fb6ddd123d68ddbe7cedbedff92cd433c1 (diff) | |
| download | bcm5719-llvm-6ee4001cc957acac39181b68193e1414c3163698.tar.gz bcm5719-llvm-6ee4001cc957acac39181b68193e1414c3163698.zip | |
Add <optional> header.
This patch is largely thanks to Casey Carter @ Microsoft. He did the initial
work of porting our experimental implementation and tests over to namespace
std.
llvm-svn: 283977
Diffstat (limited to 'libcxx/src/optional.cpp')
| -rw-r--r-- | libcxx/src/optional.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp index 8c5dd76d86d..f2fbfdfec1c 100644 --- a/libcxx/src/optional.cpp +++ b/libcxx/src/optional.cpp @@ -7,18 +7,18 @@ // //===----------------------------------------------------------------------===// +#include "optional" #include "experimental/optional" -_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL +namespace std +{ -#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS +bad_optional_access::~bad_optional_access() _NOEXCEPT = default; -bad_optional_access::~bad_optional_access() _NOEXCEPT {} +} // std -#else +_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL bad_optional_access::~bad_optional_access() _NOEXCEPT = default; -#endif - _LIBCPP_END_NAMESPACE_EXPERIMENTAL |
