From 6a1d078560b4c6539f65bf6e8aeb757a27640bde Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sun, 5 Feb 2017 20:52:32 +0000 Subject: Restore the _NOEXCEPT on the dtor of bad_optional_access. Destructors are noexcept by default, so it's not really needed, but the other exception classes have the _NOEXCEPT, and gcc complains if these are missing. I think we should remove them all - but not today. llvm-svn: 294142 --- libcxx/src/optional.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcxx/src/optional.cpp') diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp index baee026acc5..2877d175bc1 100644 --- a/libcxx/src/optional.cpp +++ b/libcxx/src/optional.cpp @@ -13,7 +13,7 @@ namespace std { -bad_optional_access::~bad_optional_access() = default; +bad_optional_access::~bad_optional_access() _NOEXCEPT = default; const char* bad_optional_access::what() const _NOEXCEPT { return "bad_optional_access"; @@ -23,6 +23,6 @@ const char* bad_optional_access::what() const _NOEXCEPT { _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL -bad_optional_access::~bad_optional_access() = default; +bad_optional_access::~bad_optional_access() _NOEXCEPT = default; _LIBCPP_END_NAMESPACE_EXPERIMENTAL -- cgit v1.2.3