diff options
Diffstat (limited to 'system/include/libcxx/condition_variable')
| -rw-r--r-- | system/include/libcxx/condition_variable | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/system/include/libcxx/condition_variable b/system/include/libcxx/condition_variable index fc3ac3df..b1a50ee5 100644 --- a/system/include/libcxx/condition_variable +++ b/system/include/libcxx/condition_variable @@ -28,8 +28,8 @@ public: condition_variable(const condition_variable&) = delete; condition_variable& operator=(const condition_variable&) = delete; - void notify_one(); - void notify_all(); + void notify_one() noexcept; + void notify_all() noexcept; void wait(unique_lock<mutex>& lock); template <class Predicate> @@ -72,8 +72,8 @@ public: condition_variable_any(const condition_variable_any&) = delete; condition_variable_any& operator=(const condition_variable_any&) = delete; - void notify_one(); - void notify_all(); + void notify_one() noexcept; + void notify_all() noexcept; template <class Lock> void wait(Lock& lock); @@ -111,7 +111,9 @@ public: #include <__mutex_base> #include <memory> +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header +#endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -122,8 +124,8 @@ class _LIBCPP_VISIBLE condition_variable_any public: condition_variable_any(); - void notify_one(); - void notify_all(); + void notify_one() _NOEXCEPT; + void notify_all() _NOEXCEPT; template <class _Lock> void wait(_Lock& __lock); @@ -159,17 +161,17 @@ condition_variable_any::condition_variable_any() inline _LIBCPP_INLINE_VISIBILITY void -condition_variable_any::notify_one() +condition_variable_any::notify_one() _NOEXCEPT { - {lock_guard<mutex> _(*__mut_);} + {lock_guard<mutex> __lx(*__mut_);} __cv_.notify_one(); } inline _LIBCPP_INLINE_VISIBILITY void -condition_variable_any::notify_all() +condition_variable_any::notify_all() _NOEXCEPT { - {lock_guard<mutex> _(*__mut_);} + {lock_guard<mutex> __lx(*__mut_);} __cv_.notify_all(); } @@ -186,8 +188,8 @@ condition_variable_any::wait(_Lock& __lock) shared_ptr<mutex> __mut = __mut_; unique_lock<mutex> __lk(*__mut); __lock.unlock(); - unique_ptr<_Lock, __lock_external> __(&__lock); - lock_guard<unique_lock<mutex> > _(__lk, adopt_lock); + unique_ptr<_Lock, __lock_external> __lxx(&__lock); + lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock); __cv_.wait(__lk); } // __mut_.unlock(), __lock.lock() @@ -208,8 +210,8 @@ condition_variable_any::wait_until(_Lock& __lock, shared_ptr<mutex> __mut = __mut_; unique_lock<mutex> __lk(*__mut); __lock.unlock(); - unique_ptr<_Lock, __lock_external> __(&__lock); - lock_guard<unique_lock<mutex> > _(__lk, adopt_lock); + unique_ptr<_Lock, __lock_external> __lxx(&__lock); + lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock); return __cv_.wait_until(__lk, __t); } // __mut_.unlock(), __lock.lock() |