X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e9b70d3dc4bc81e7f13c923ba3e6a736395d963..5a00610e05eab122e23f56b589d5bb240e6ceda7:/src/simix/smx_network_private.h diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index ca85abf0db..6cdbe6f0a6 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -18,7 +18,7 @@ #include "simgrid/simix.h" #include "popping_private.h" -#include "src/simix/smx_process_private.h" +#include "src/simix/ActorImpl.hpp" namespace simgrid { namespace simix { @@ -27,22 +27,22 @@ namespace simix { class Mailbox { public: - Mailbox(const char* name) : mbox_(this), name(xbt_strdup(name)) {} + Mailbox(const char* name) : piface_(this), name(xbt_strdup(name)) {} ~Mailbox() { xbt_free(name); } - simgrid::s4u::Mailbox mbox_; + simgrid::s4u::Mailbox piface_; // Our interface char* name; std::deque comm_queue; - boost::intrusive_ptr permanent_receiver; //process which the mailbox is attached to + boost::intrusive_ptr permanent_receiver; //process which the mailbox is attached to std::deque done_comm_queue;//messages already received in the permanent receive mode }; } } -XBT_PRIVATE void SIMIX_mailbox_exit(void); +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);