A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Deprecate SIMIX_get_clock().
[simgrid.git]
/
src
/
s4u
/
s4u_ConditionVariable.cpp
diff --git
a/src/s4u/s4u_ConditionVariable.cpp
b/src/s4u/s4u_ConditionVariable.cpp
index
7244cf8
..
cfced69
100644
(file)
--- a/
src/s4u/s4u_ConditionVariable.cpp
+++ b/
src/s4u/s4u_ConditionVariable.cpp
@@
-66,7
+66,7
@@
std::cv_status s4u::ConditionVariable::wait_for(const std::unique_lock<Mutex>& l
std::cv_status ConditionVariable::wait_until(const std::unique_lock<Mutex>& lock, double timeout_time)
{
- double now =
SIMIX_
get_clock();
+ double now =
Engine::
get_clock();
double timeout;
if (timeout_time < now)
timeout = 0.0;