Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/thread/win32/condition_variable.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/thread/win32/condition_variable.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/thread/win32/condition_variable.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -96,7 +96,7 @@ bool woken() { - unsigned long const woken_result=detail::win32::WaitForSingleObject(wake_sem,0); + unsigned long const woken_result=detail::win32::WaitForSingleObjectEx(wake_sem,0,0); BOOST_ASSERT((woken_result==detail::win32::timeout) || (woken_result==0)); return woken_result==0; } @@ -337,7 +337,16 @@ template<typename duration_type> bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration) { - return do_wait(m,wait_duration.total_milliseconds()); + if (wait_duration.is_pos_infinity()) + { + wait(m); // or do_wait(m,detail::timeout::sentinel()); + return true; + } + if (wait_duration.is_special()) + { + return true; + } + return do_wait(m,wait_duration.total_milliseconds()); } template<typename predicate_type>