diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-18 09:44:54 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-18 09:44:54 +0000 |
| commit | b400ae4591cca9388b98ff2bff118e4f5bac4d2a (patch) | |
| tree | b755453be8f098a34c0f4d66b6b194a2fbfd0e1c /libstdc++-v3/include/std/condition_variable | |
| parent | 14c63b71164d50bfe7b9ee245b69859a630c5d8d (diff) | |
| download | ppe42-gcc-b400ae4591cca9388b98ff2bff118e4f5bac4d2a.tar.gz ppe42-gcc-b400ae4591cca9388b98ff2bff118e4f5bac4d2a.zip | |
2009-12-18 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/condition_variable: Revert inadvertent changes.
* testsuite/30_threads/condition_variable/cons/assign_neg.cc: Ditto.
* testsuite/30_threads/condition_variable/cons/copy_neg.cc: Ditto.
* testsuite/30_threads/condition_variable/members/1.cc: Ditto.
* testsuite/30_threads/condition_variable/members/2.cc: Ditto.
* testsuite/30_threads/condition_variable_any/cons/assign_neg.cc: Ditto.
* testsuite/30_threads/condition_variable_any/cons/copy_neg.cc: Ditto.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155343 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/condition_variable')
| -rw-r--r-- | libstdc++-v3/include/std/condition_variable | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index f5e4db15c2a..f87eb1b8d1a 100644 --- a/libstdc++-v3/include/std/condition_variable +++ b/libstdc++-v3/include/std/condition_variable @@ -50,9 +50,6 @@ namespace std * @{ */ - /// cv_status - enum class cv_status { no_timeout, timeout }; - /// condition_variable class condition_variable { @@ -87,13 +84,13 @@ namespace std } template<typename _Duration> - cv_status + bool wait_until(unique_lock<mutex>& __lock, const chrono::time_point<__clock_t, _Duration>& __atime) { return __wait_until_impl(__lock, __atime); } template<typename _Clock, typename _Duration> - cv_status + bool wait_until(unique_lock<mutex>& __lock, const chrono::time_point<_Clock, _Duration>& __atime) { @@ -113,14 +110,14 @@ namespace std _Predicate __p) { while (!__p()) - if (wait_until(__lock, __atime) == cv_status::timeout) + if (!wait_until(__lock, __atime)) return __p(); return true; } template<typename _Rep, typename _Period> - cv_status + bool wait_for(unique_lock<mutex>& __lock, const chrono::duration<_Rep, _Period>& __rtime) { return wait_until(__lock, __clock_t::now() + __rtime); } @@ -138,7 +135,7 @@ namespace std private: template<typename _Clock, typename _Duration> - cv_status + bool __wait_until_impl(unique_lock<mutex>& __lock, const chrono::time_point<_Clock, _Duration>& __atime) { @@ -157,8 +154,7 @@ namespace std __gthread_cond_timedwait(&_M_cond, __lock.mutex()->native_handle(), &__ts); - return (_Clock::now() < __atime - ? cv_status::no_timeout : cv_status::timeout); + return _Clock::now() < __atime; } }; @@ -193,7 +189,7 @@ namespace std wait(_Lock& __lock, _Predicate __p); template<typename _Lock, typename _Clock, typename _Duration> - cv_status + bool wait_until(_Lock& __lock, const chrono::time_point<_Clock, _Duration>& __atime); @@ -205,7 +201,7 @@ namespace std _Predicate __p); template<typename _Lock, typename _Rep, typename _Period> - cv_status + bool wait_for(_Lock& __lock, const chrono::duration<_Rep, _Period>& __rtime); template<typename _Lock, typename _Rep, |
