summaryrefslogtreecommitdiff
path: root/zen/thread.h
diff options
context:
space:
mode:
Diffstat (limited to 'zen/thread.h')
-rw-r--r--zen/thread.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/zen/thread.h b/zen/thread.h
index 638d9474..76596513 100644
--- a/zen/thread.h
+++ b/zen/thread.h
@@ -128,7 +128,7 @@ public:
void reportFinished(std::unique_ptr<T>&& result)
{
{
- boost::unique_lock<boost::mutex> dummy(lockResult);
+ boost::lock_guard<boost::mutex> dummy(lockResult);
++jobsFinished;
if (!result_)
result_ = std::move(result);
@@ -149,7 +149,6 @@ public:
std::unique_ptr<T> getResult(size_t jobsTotal)
{
boost::unique_lock<boost::mutex> dummy(lockResult);
-
while (!jobDone(jobsTotal))
conditionJobDone.timed_wait(dummy, boost::posix_time::milliseconds(50)); //interruption point!
bgstack15