please sonar

[simgrid.git] / include / simgrid / s4u / comm.hpp

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index 9c853dc..7ff8615 100644 (file)
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -10,7 +10,6 @@
 
 #include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/mailbox.hpp>
 #include <simgrid/forward.h>
 
 
@@ -78,13 +77,13 @@ public:
     return res;
   }
   /** Creates (but don't start) an async send to the mailbox @p dest */
-  static Comm &send_init(Mailbox &dest);
+  static Comm &send_init(MailboxPtr dest);
   /** Creates and start an async send to the mailbox @p dest */
-  static Comm &send_async(Mailbox &dest, void *data, int simulatedByteAmount);
+  static Comm &send_async(MailboxPtr dest, void *data, int simulatedByteAmount);
     /** Creates (but don't start) an async recv onto the mailbox @p from */
-  static Comm &recv_init(Mailbox &from);
+  static Comm &recv_init(MailboxPtr from);
   /** Creates and start an async recv to the mailbox @p from */
-  static Comm &recv_async(Mailbox &from, void **data);
+  static Comm &recv_async(MailboxPtr from, void **data);
 
   void start() override;
   void wait() override;
@@ -119,13 +118,13 @@ private:
 
   /* FIXME: expose these elements in the API */
   int detached_ = 0;
-  int (*matchFunction_)(void *, void *, smx_synchro_t) = nullptr;
+  int (*matchFunction_)(void *, void *, smx_activity_t) = nullptr;
   void (*cleanFunction_)(void *) = nullptr;
-  void (*copyDataFunction_)(smx_synchro_t, void*, size_t) = nullptr;
+  void (*copyDataFunction_)(smx_activity_t, void*, size_t) = nullptr;
 
-  smx_process_t sender_ = nullptr;
-  smx_process_t receiver_ = nullptr;
-  Mailbox *mailbox_ = nullptr;
+  smx_actor_t sender_ = nullptr;
+  smx_actor_t receiver_ = nullptr;
+  MailboxPtr mailbox_ = nullptr;
 };
 
 }} // namespace simgrid::s4u