X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..ac080087b39ef79ff497d3992ff04b3e20fe40b2:/include/simgrid/s4u/Mutex.hpp diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp index 4a483ced47..05f49123ad 100644 --- a/include/simgrid/s4u/Mutex.hpp +++ b/include/simgrid/s4u/Mutex.hpp @@ -27,17 +27,17 @@ namespace s4u { * */ class XBT_PUBLIC Mutex { - friend simgrid::s4u::ConditionVariable; - friend simgrid::kernel::activity::MutexImpl; - - simgrid::kernel::activity::MutexImpl* pimpl_; - explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {} + friend ConditionVariable; + friend kernel::activity::MutexImpl; + kernel::activity::MutexImpl* const pimpl_; /* refcounting */ friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex); friend XBT_PUBLIC void intrusive_ptr_release(Mutex* mutex); public: + explicit Mutex(kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {} + ~Mutex(); // No copy: /** You cannot create a new mutex by copying an existing one. Use MutexPtr instead */ Mutex(Mutex const&) = delete; @@ -46,18 +46,12 @@ public: /** Constructs a new mutex */ static MutexPtr create(); - void lock(); void unlock(); bool try_lock(); - -#ifndef DOXYGEN - // deprecated - /** @deprecated Mutex::create() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mutex::create()") static MutexPtr createMutex() { return create(); } -#endif }; -}} // namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif /* SIMGRID_S4U_MUTEX_HPP */