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
d52df2d
..
ae785f4
100644
(file)
--- a/
include/simgrid/s4u/Mutex.hpp
+++ b/
include/simgrid/s4u/Mutex.hpp
@@
-29,10
+29,12
@@
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;
- simgrid::kernel::activity::MutexImpl* mutex_;
- explicit Mutex(simgrid::kernel::activity::MutexImpl * mutex) : mutex_(mutex) {}
+#endif
+ simgrid::kernel::activity::MutexImpl* pimpl_;
+ explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
/* refcounting */
friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
/* refcounting */
friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
@@
-48,11
+50,15
@@
public:
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
- static Ptr create
Mutex
();
+ static Ptr create();
void lock();
void unlock();
bool try_lock();
void lock();
void unlock();
bool try_lock();
+
+ // deprecated
+ /** @deprecated Mutex::create() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static Ptr createMutex() { return create(); }
};
using MutexPtr = Mutex::Ptr;
};
using MutexPtr = Mutex::Ptr;