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
docs: start writing the S4U part
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Mutex.hpp
diff --git
a/include/simgrid/s4u/Mutex.hpp
b/include/simgrid/s4u/Mutex.hpp
index
4230a98
..
5feed70
100644
(file)
--- a/
include/simgrid/s4u/Mutex.hpp
+++ b/
include/simgrid/s4u/Mutex.hpp
@@
-29,8
+29,9
@@
class ConditionVariable;
*
*/
class XBT_PUBLIC Mutex {
*
*/
class XBT_PUBLIC Mutex {
- friend ConditionVariable;
+ friend
simgrid::s4u::
ConditionVariable;
friend simgrid::kernel::activity::MutexImpl;
friend simgrid::kernel::activity::MutexImpl;
+
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) {}
@@
-39,8
+40,6
@@
class XBT_PUBLIC Mutex {
friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex);
public:
friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex);
public:
- using Ptr = boost::intrusive_ptr<Mutex>;
-
// No copy:
/** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */
Mutex(Mutex const&) = delete;
// No copy:
/** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */
Mutex(Mutex const&) = delete;
@@
-48,14
+47,16
@@
public:
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
Mutex& operator=(Mutex const&) = delete;
/** Constructs a new mutex */
- static
Ptr createMutex
();
+ static
MutexPtr create
();
void lock();
void unlock();
bool try_lock();
void lock();
void unlock();
bool try_lock();
-};
-using MutexPtr = Mutex::Ptr;
+ // deprecated
+ /** @deprecated Mutex::create() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static MutexPtr createMutex() { return create(); }
+};
}} // namespace simgrid::s4u
}} // namespace simgrid::s4u