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
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
f279016
..
9c9c58a
100644
(file)
--- a/
include/simgrid/s4u/conditionVariable.hpp
+++ b/
include/simgrid/s4u/conditionVariable.hpp
@@
-6,6
+6,7
@@
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
+#include <mutex>
#include <utility> // std::swap
#include <simgrid/simix.h>
#include <utility> // std::swap
#include <simgrid/simix.h>
@@
-49,8
+50,8
@@
public:
/**
* Wait functions
*/
/**
* 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
/**
* Notify functions