X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dbb8aa24d54e0a4091b1f01017032702d0376f7..cd1b6fc186f641dd5e3fb68d793c6253e1b8fcd9:/include/simgrid/s4u/mailbox.hpp

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/mailbox.hpp
index d98da456ed..5914a41065 100644
--- a/include/simgrid/s4u/mailbox.hpp
+++ b/include/simgrid/s4u/mailbox.hpp
@@ -3,18 +3,20 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#ifdef __cplusplus
+
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
 #include <boost/unordered_map.hpp>
 
-#include "actor.hpp"
+#include <xbt/base.h>
+#include <simgrid/s4u/forward.hpp>
+#include <simgrid/s4u/actor.hpp>
 
 namespace simgrid {
 namespace s4u {
 
-class Comm;
-
 /** @brief Mailboxes
  *
  * Rendez-vous point for network communications, similar to URLs on which you could post and retrieve data.
@@ -22,26 +24,27 @@ class Comm;
  * You can access any mailbox without any latency. The network delay are only related to the location of the
  * sender and receiver.
  */
-class Mailbox {
-	friend Comm;
+XBT_PUBLIC_CLASS Mailbox {
+  friend Comm;
 
 private:
-	Mailbox(const char*name, smx_rdv_t inferior);
+  Mailbox(const char*name, smx_mailbox_t inferior);
 public:
-	~Mailbox();
-	
+  ~Mailbox();
+  
 protected:
-	smx_rdv_t getInferior() { return p_inferior; }
+  smx_mailbox_t getInferior() { return inferior_; }
 
 public:
-	/** Retrieve the mailbox associated to the given string */
-	static Mailbox *byName(const char *name);
+  /** Retrieve the mailbox associated to the given string */
+  static Mailbox *byName(const char *name);
 
 private:
-	std::string p_name;
-	smx_rdv_t p_inferior;
-	static boost::unordered_map<std::string, Mailbox *> *channels;
+  smx_mailbox_t inferior_;
+  static boost::unordered_map<std::string, Mailbox *> *mailboxes;
 };
 }} // namespace simgrid::s4u
 
+#endif
+
 #endif /* SIMGRID_S4U_MAILBOX_HPP */