X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/554255fe3f311a54df171d31a4a27f4004840f59..d6a6f4f26c0d542e0aae18af844d28e5501fed72:/src/s4u/s4u_ConditionVariable.cpp

diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp
index 7244cf83c9..67c3229b40 100644
--- a/src/s4u/s4u_ConditionVariable.cpp
+++ b/src/s4u/s4u_ConditionVariable.cpp
@@ -3,16 +3,13 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "simgrid/cond.h"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/ConditionVariable.hpp"
-#include "simgrid/simix.h"
+#include <simgrid/cond.h>
+#include <simgrid/s4u/ConditionVariable.hpp>
+#include <xbt/log.h>
+
 #include "src/kernel/activity/ConditionVariableImpl.hpp"
-#include "src/kernel/activity/MutexImpl.hpp"
 #include "src/kernel/actor/SimcallObserver.hpp"
-#include "xbt/log.hpp"
 
-#include <exception>
 #include <mutex>
 
 namespace simgrid {
@@ -66,7 +63,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;