diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-03-26 02:45:04 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-03-26 02:45:04 +0000 |
| commit | 1641a7c1cb198cb5bb4b96d0890d1e7d13e089c4 (patch) | |
| tree | c0b96a2cc3983afefb7ab9d2c28b775c85f42a27 /libcxx/include/__mutex_base | |
| parent | 28c391f68e95408ef263bad494addc5e77975e50 (diff) | |
| download | bcm5719-llvm-1641a7c1cb198cb5bb4b96d0890d1e7d13e089c4.tar.gz bcm5719-llvm-1641a7c1cb198cb5bb4b96d0890d1e7d13e089c4.zip | |
Implement LWG issue #2135. If something goes wrong in condition_variable::wait, call terminate() rather than throwing an error. Do this indirectly, by marking the call as 'noexcept'. This is better than just calling terminate() directly, because it gives a better error message on the console.
llvm-svn: 204778
Diffstat (limited to 'libcxx/include/__mutex_base')
| -rw-r--r-- | libcxx/include/__mutex_base | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index abb1c125804..293feada648 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -282,7 +282,7 @@ public: void notify_one() _NOEXCEPT; void notify_all() _NOEXCEPT; - void wait(unique_lock<mutex>& __lk); + void wait(unique_lock<mutex>& __lk) _NOEXCEPT; template <class _Predicate> void wait(unique_lock<mutex>& __lk, _Predicate __pred); @@ -313,7 +313,7 @@ public: private: void __do_timed_wait(unique_lock<mutex>& __lk, - chrono::time_point<chrono::system_clock, chrono::nanoseconds>); + chrono::time_point<chrono::system_clock, chrono::nanoseconds>) _NOEXCEPT; }; template <class _To, class _Rep, class _Period> |
