Make Mutex::~Mutex() private.

This is a followup to commit f4e9eed9a710cd589a2ab070348121e9c4c3a861
"Use Mutex::create() for sg_mutex_init()."

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 1eef471..d7179fd 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -125,6 +125,8 @@ namespace activity {
   using IoImplPtr = boost::intrusive_ptr<IoImpl>;
   class MutexImpl;
   using MutexImplPtr = boost::intrusive_ptr<MutexImpl>;
+  XBT_PUBLIC void intrusive_ptr_add_ref(MutexImpl* mutex);
+  XBT_PUBLIC void intrusive_ptr_release(MutexImpl* mutex);
   class RawImpl;
   using RawImplPtr = boost::intrusive_ptr<RawImpl>;
   class SemaphoreImpl;

diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp
index f97eae8..4f2c486 100644 (file)
--- a/include/simgrid/s4u/Mutex.hpp
+++ b/include/simgrid/s4u/Mutex.hpp
@@ -31,6 +31,7 @@ namespace s4u {
 class XBT_PUBLIC Mutex {
   friend ConditionVariable;
   friend kernel::activity::MutexImpl;
+  friend void kernel::activity::intrusive_ptr_release(kernel::activity::MutexImpl* mutex);
 
   kernel::activity::MutexImpl* const pimpl_;
   /* refcounting */
@@ -38,6 +39,7 @@ class XBT_PUBLIC Mutex {
   friend XBT_PUBLIC void intrusive_ptr_release(const Mutex* mutex);
 
   explicit Mutex(kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
+  ~Mutex() = default;
 #ifndef DOXYGEN
   Mutex(Mutex const&) = delete;            // No copy constructor; Use MutexPtr instead
   Mutex& operator=(Mutex const&) = delete; // No direct assignment either. Use MutexPtr instead