summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2019-04-25 20:00:06 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2019-04-25 20:00:06 +0000
commit65d4d5e9e7bb06153ffd9de9b7ad7a1a676d36fc (patch)
tree90bd0c42651505e0fb3b00ce14fc84fae0e4e724
parent3bf8d7639f49b03ddb80fbc107a0f67fe03397f6 (diff)
downloadbcm5719-llvm-65d4d5e9e7bb06153ffd9de9b7ad7a1a676d36fc.tar.gz
bcm5719-llvm-65d4d5e9e7bb06153ffd9de9b7ad7a1a676d36fc.zip
Fix buildbot failures after r359159.
std::mutex was not actually is_nothrow_default_constructible in C++98/C++03, because the variable declaration std::mutex M; ... could throw an exception from the mutex destructor. Fix it by marking the destructor as non-throwing. This has no effect in C++11 onwards, because destructors are non-throwing by default in those language modes. llvm-svn: 359229
-rw-r--r--libcxx/include/__mutex_base2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base
index 008be9594e3..0c34a3bf709 100644
--- a/libcxx/include/__mutex_base
+++ b/libcxx/include/__mutex_base
@@ -51,7 +51,7 @@ public:
#else
mutex() _NOEXCEPT {__m_ = (__libcpp_mutex_t)_LIBCPP_MUTEX_INITIALIZER;}
#endif
- ~mutex();
+ ~mutex() _NOEXCEPT;
private:
mutex(const mutex&);// = delete;
OpenPOWER on IntegriCloud