X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f00ed8e7bb1267a9fb7a68b413f705c606068f5..3877d90836e4902835c5464074090c4d928dac6d:/include/simgrid/s4u/Mutex.hpp diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index d52df2d19c..5feed70146 100644 --- a/include/simgrid/s4u/Mutex.hpp +++ b/include/simgrid/s4u/Mutex.hpp @@ -29,18 +29,17 @@ class ConditionVariable; * */ class XBT_PUBLIC Mutex { - friend ConditionVariable; + friend simgrid::s4u::ConditionVariable; friend simgrid::kernel::activity::MutexImpl; - simgrid::kernel::activity::MutexImpl* mutex_; - explicit Mutex(simgrid::kernel::activity::MutexImpl * mutex) : mutex_(mutex) {} + + 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); friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex); public: - using Ptr = boost::intrusive_ptr; - // 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 */ - static Ptr createMutex(); + static MutexPtr create(); 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