X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9c92907fc7a130fd6abc60b98791daa320742ba2..5f389553c3b6a2070fca0562c8143ff0b143ab52:/src/simix/smx_network_private.h

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 6cdbe6f0a6..9c155946ec 100644
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -14,7 +14,7 @@
 
 #include <xbt/base.h>
 
-#include <simgrid/s4u/mailbox.hpp>
+#include <simgrid/s4u/Mailbox.hpp>
 
 #include "simgrid/simix.h"
 #include "popping_private.h"
@@ -34,9 +34,9 @@ public:
 
   simgrid::s4u::Mailbox piface_; // Our interface
   char* name;
-  std::deque<smx_synchro_t> comm_queue;
+  std::deque<smx_activity_t> comm_queue;
   boost::intrusive_ptr<simgrid::simix::ActorImpl> permanent_receiver; //process which the mailbox is attached to
-  std::deque<smx_synchro_t> done_comm_queue;//messages already received in the permanent receive mode
+  std::deque<smx_activity_t> done_comm_queue;//messages already received in the permanent receive mode
 };
 
 }
@@ -46,15 +46,15 @@ XBT_PRIVATE void SIMIX_mailbox_exit();
 
 XBT_PRIVATE smx_mailbox_t SIMIX_mbox_create(const char *name);
 XBT_PRIVATE smx_mailbox_t SIMIX_mbox_get_by_name(const char *name);
-XBT_PRIVATE void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_synchro_t comm);
+XBT_PRIVATE void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_activity_t comm);
 
-XBT_PRIVATE void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t proc);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox,
+XBT_PRIVATE void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t proc);
+XBT_PRIVATE smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox,
                               void *dst_buff, size_t *dst_buff_size,
-                              int (*match_fun)(void *, void *, smx_synchro_t),
-                              void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+                              int (*match_fun)(void *, void *, smx_activity_t),
+                              void (*copy_data_fun)(smx_activity_t, void*, size_t),
                               void *data, double rate);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int type, int src,
-                              int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data);
+XBT_PRIVATE smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, int src,
+                              int tag, int (*match_fun)(void *, void *, smx_activity_t), void *data);
 
 #endif