-typedef struct s_smx_mailbox {
- char *name;
- std::deque<smx_synchro_t> *comm_queue;
- smx_process_t 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
-} s_smx_mailbox_t;
+
+class Mailbox {
+public:
+ Mailbox(const char* name) : mbox_(this), name(xbt_strdup(name)) {}
+ ~Mailbox() {
+ xbt_free(name);
+ }
+
+ simgrid::s4u::Mailbox mbox_;
+ char* name;
+ std::deque<smx_synchro_t> comm_queue;
+ boost::intrusive_ptr<simgrid::simix::Process> 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
+};
+
+}
+}