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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mutex.hpp
diff --git
a/include/simgrid/s4u/Mutex.hpp
b/include/simgrid/s4u/Mutex.hpp
index
b30de03
..
ae785f4
100644
(file)
--- a/
include/simgrid/s4u/Mutex.hpp
+++ b/
include/simgrid/s4u/Mutex.hpp
@@
-29,8
+29,10
@@
class ConditionVariable;
*
*/
class XBT_PUBLIC Mutex {
*
*/
class XBT_PUBLIC Mutex {
+#ifndef DOXYGEN
friend ConditionVariable;
friend simgrid::kernel::activity::MutexImpl;
friend ConditionVariable;
friend simgrid::kernel::activity::MutexImpl;
+#endif
simgrid::kernel::activity::MutexImpl* pimpl_;
explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
simgrid::kernel::activity::MutexImpl* pimpl_;
explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
@@
-55,6
+57,7
@@
public:
bool try_lock();
// deprecated
bool try_lock();
// deprecated
+ /** @deprecated Mutex::create() */
XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static Ptr createMutex() { return create(); }
};
XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static Ptr createMutex() { return create(); }
};