Please mingw.

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

diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
index f7d280d..035a928 100644 (file)
--- a/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */

 
 /* 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. */
 
 /* 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. */


@@ -9,6 +9,7 @@
 #include <string>
 
 #include <xbt/base.h>
 #include <string>
 
 #include <xbt/base.h>

+#include <xbt/string.hpp>

 
 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/s4u/Actor.hpp>
 
 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/s4u/Actor.hpp>


@@ -103,9 +104,8 @@ namespace s4u {
  *
  * @section s4u_mb_api The API
  */
  *
  * @section s4u_mb_api The API
  */

-XBT_PUBLIC_CLASS Mailbox {
+class XBT_PUBLIC Mailbox {

   friend Comm;
   friend Comm;

-  friend simgrid::s4u::Engine;

   friend simgrid::kernel::activity::MailboxImpl;
 
   simgrid::kernel::activity::MailboxImpl* pimpl_;
   friend simgrid::kernel::activity::MailboxImpl;
 
   simgrid::kernel::activity::MailboxImpl* pimpl_;


@@ -113,15 +113,17 @@ XBT_PUBLIC_CLASS Mailbox {
   explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {}
 
   /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */
   explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {}
 
   /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */

-  friend void intrusive_ptr_add_ref(Mailbox*) {}
+  friend XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox*) {}

   /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */
   /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */

-  friend void intrusive_ptr_release(Mailbox*) {}
+  friend XBT_PUBLIC void intrusive_ptr_release(Mailbox*) {}

 public:
   /** private function, do not use. FIXME: make me protected */
   kernel::activity::MailboxImpl* getImpl() { return pimpl_; }
 
 public:
   /** private function, do not use. FIXME: make me protected */
   kernel::activity::MailboxImpl* getImpl() { return pimpl_; }
 

-  /** Gets the name of that mailbox */
-  const char* getName();
+  /** @brief Retrieves the name of that mailbox as a C++ string */
+  const simgrid::xbt::string& getName() const;
+  /** @brief Retrieves the name of that mailbox as a C string */
+  const char* getCname() const;

 
   /** Retrieve the mailbox associated to the given C string */
   static MailboxPtr byName(const char *name);
 
   /** Retrieve the mailbox associated to the given C string */
   static MailboxPtr byName(const char *name);