Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / s4u / conditionVariable.hpp

diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/conditionVariable.hpp
index ec9823d..9c9c58a 100644 (file)
--- a/include/simgrid/s4u/conditionVariable.hpp
+++ b/include/simgrid/s4u/conditionVariable.hpp
@@ -6,8 +6,11 @@
 #ifndef SIMGRID_S4U_COND_VARIABLE_HPP
 #define SIMGRID_S4U_COND_VARIABLE_HPP
 
-#include <simgrid/s4u/mutex.hpp>
+#include <mutex>
+#include <utility> // std::swap
 
+#include <simgrid/simix.h>
+#include <simgrid/s4u/mutex.hpp>
 
 namespace simgrid {
 namespace s4u {
@@ -47,8 +50,8 @@ public:
   /**
   * Wait functions
   */
-  void wait(Mutex *mutex);
-  void wait_for(Mutex *mutex, double time);
+  void wait(std::unique_lock<Mutex>& lock);
+  void wait_for(std::unique_lock<Mutex>& lock, double time);
 
   /**
   * Notify functions