summaryrefslogtreecommitdiffstats
path: root/libcxx/include/optional
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2017-02-05 20:52:32 +0000
committerMarshall Clow <mclow.lists@gmail.com>2017-02-05 20:52:32 +0000
commit6a1d078560b4c6539f65bf6e8aeb757a27640bde (patch)
treea1f8cc082a152a6f1f281b52396d36923e1f7e3f /libcxx/include/optional
parent46663d556781b4a11b240fdae61126d4004f7e56 (diff)
downloadbcm5719-llvm-6a1d078560b4c6539f65bf6e8aeb757a27640bde.tar.gz
bcm5719-llvm-6a1d078560b4c6539f65bf6e8aeb757a27640bde.zip
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/include/optional')
-rw-r--r--libcxx/include/optional2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/optional b/libcxx/include/optional
index ff3e929e1ca..180f63ffcee 100644
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -164,7 +164,7 @@ class _LIBCPP_EXCEPTION_ABI bad_optional_access
{
public:
// 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;
};
OpenPOWER on IntegriCloud