diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2017-02-05 20:52:32 +0000 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2017-02-05 20:52:32 +0000 |
commit | 6a1d078560b4c6539f65bf6e8aeb757a27640bde (patch) | |
tree | a1f8cc082a152a6f1f281b52396d36923e1f7e3f /libcxx/src/optional.cpp | |
parent | 46663d556781b4a11b240fdae61126d4004f7e56 (diff) | |
download | llvm-6a1d078560b4c6539f65bf6e8aeb757a27640bde.zip llvm-6a1d078560b4c6539f65bf6e8aeb757a27640bde.tar.gz llvm-6a1d078560b4c6539f65bf6e8aeb757a27640bde.tar.bz2 |
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
Diffstat (limited to 'libcxx/src/optional.cpp')
-rw-r--r-- | libcxx/src/optional.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp index baee026..2877d17 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 |