LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294142 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-02-05 20:52:32 +00:00
parent a1c7fbb6f9
commit 0becc206e3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/experimental/optional
View File

@@ -152,7 +152,7 @@ public:
bad_optional_access() : std::logic_error("Bad optional Access") {} bad_optional_access() : std::logic_error("Bad optional Access") {}
// Get the key function ~bad_optional_access() into the dylib // Get the key function ~bad_optional_access() into the dylib
virtual ~bad_optional_access(); virtual ~bad_optional_access() _NOEXCEPT;
}; };
_LIBCPP_END_NAMESPACE_EXPERIMENTAL _LIBCPP_END_NAMESPACE_EXPERIMENTAL

2
include/optional
View File

@@ -164,7 +164,7 @@ class _LIBCPP_EXCEPTION_ABI bad_optional_access
{ {
public: public:
// Get the key function ~bad_optional_access() into the dylib // Get the key function ~bad_optional_access() into the dylib
virtual ~bad_optional_access(); virtual ~bad_optional_access() _NOEXCEPT;
virtual const char* what() const _NOEXCEPT; virtual const char* what() const _NOEXCEPT;
}; };

4
src/optional.cpp
View File

@@ -13,7 +13,7 @@
namespace std 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 { const char* bad_optional_access::what() const _NOEXCEPT {
return "bad_optional_access"; return "bad_optional_access";
@@ -23,6 +23,6 @@ const char* bad_optional_access::what() const _NOEXCEPT {
_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
bad_optional_access::~bad_optional_access() = default; bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
_LIBCPP_END_NAMESPACE_EXPERIMENTAL _LIBCPP_END_NAMESPACE_EXPERIMENTAL