diff options
| author | David Chisnall <theraven@FreeBSD.org> | 2012-11-13 02:41:32 +0000 |
|---|---|---|
| committer | David Chisnall <theraven@FreeBSD.org> | 2012-11-13 02:41:32 +0000 |
| commit | 3b5257a34b8cc9da481af474449a5d7cfac88d0d (patch) | |
| tree | 72342359bbf1cc58cf84be08c6933e45da5ed4da /include/condition_variable | |
| parent | ea907107107132d0201e0ba377408f4e117b581c (diff) | |
Notes
Diffstat (limited to 'include/condition_variable')
| -rw-r--r-- | include/condition_variable | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/condition_variable b/include/condition_variable index 7d0b069a793b..b1a50ee5ff13 100644 --- a/include/condition_variable +++ b/include/condition_variable @@ -163,7 +163,7 @@ inline _LIBCPP_INLINE_VISIBILITY void condition_variable_any::notify_one() _NOEXCEPT { - {lock_guard<mutex> _(*__mut_);} + {lock_guard<mutex> __lx(*__mut_);} __cv_.notify_one(); } @@ -171,7 +171,7 @@ inline _LIBCPP_INLINE_VISIBILITY void condition_variable_any::notify_all() _NOEXCEPT { - {lock_guard<mutex> _(*__mut_);} + {lock_guard<mutex> __lx(*__mut_);} __cv_.notify_all(); } @@ -188,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() @@ -210,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() |