correctly use clumsy xbt_dynar interface

How can I be so stupid?

diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp
index 8bf6c8f..697f259 100644 (file)
--- a/include/simgrid/s4u/Comm.hpp
+++ b/include/simgrid/s4u/Comm.hpp
@@ -32,7 +32,7 @@ public:
   {
     // Map to dynar<Synchro*>:
     xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::kernel::activity::ActivityImpl*), [](void*ptr){
-      intrusive_ptr_release((simgrid::kernel::activity::ActivityImpl*)ptr);
+      intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
     });
     for (I iter = first; iter != last; iter++) {
       CommPtr comm = *iter;
@@ -59,7 +59,7 @@ public:
   {
     // Map to dynar<Synchro*>:
     xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::kernel::activity::ActivityImpl*), [](void*ptr){
-      intrusive_ptr_release((simgrid::kernel::activity::ActivityImpl*)ptr);
+      intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
     });
     for (I iter = first; iter != last; iter++) {
       CommPtr comm = *iter;

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 98d5871..7f2e4b4 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -635,7 +635,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
 
   /* create the equivalent dynar with SIMIX objects */
   xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_activity_t), [](void*ptr){
-    intrusive_ptr_release((simgrid::kernel::activity::ActivityImpl*)ptr);
+    intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
   });
   msg_comm_t comm;
   unsigned int cursor;

diff --git a/src/smpi/smpi_request.cpp b/src/smpi/smpi_request.cpp
index 6001f75..ebfc570 100644 (file)
--- a/src/smpi/smpi_request.cpp
+++ b/src/smpi/smpi_request.cpp
@@ -763,7 +763,7 @@ int Request::waitany(int count, MPI_Request requests[], MPI_Status * status)
   if(count > 0) {
     // Wait for a request to complete
     xbt_dynar_init(&comms, sizeof(smx_activity_t), [](void*ptr){
-      intrusive_ptr_release((simgrid::kernel::activity::ActivityImpl*)ptr);
+      intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
     });
     int *map = xbt_new(int, count);
     XBT_DEBUG("Wait for one of %d", count);