From f54f85d007e529fa6e0bff63428652a54176e95c Mon Sep 17 00:00:00 2001 From: adfaure Date: Thu, 23 Jun 2016 16:01:40 +0200 Subject: [PATCH 1/1] [s4u] fix s4u::ConditionVariable::wait_for() return std::cv_status::timeout when notified --- src/s4u/s4u_conditionVariable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp index 02f4f825db..8ed32f4d6d 100644 --- a/src/s4u/s4u_conditionVariable.cpp +++ b/src/s4u/s4u_conditionVariable.cpp @@ -26,7 +26,7 @@ void s4u::ConditionVariable::wait(std::unique_lock& lock) { std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock& lock, double timeout) { try { simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout); - return std::cv_status::timeout; + return std::cv_status::no_timeout; } catch (xbt_ex& e) { -- 2.20.1