From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 28 Jul 2016 14:23:57 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_14~699
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dee506dc59257b5afd49259f00de04913a2d3f29?hp=b89614a07109aac74c1aa5adc74acb8ecac8557b

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index ae778de98d..292a67d166 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -472,8 +472,9 @@ XBT_PUBLIC(int) MSG_mailbox_is_empty(msg_mailbox_t mailbox);
  */
 XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias);
 
-/* @brief MSG_mailbox_get_head - get the task at the head of a mailbox.
+/* @brief MSG_mailbox_front - get the task at the head of a mailbox.
  * Returns the task at the head of the mailbox. This function does not remove the task from the mailbox.
+ * @deprecated
  * @param   mailbox  The mailbox concerned by the operation.
  * @return           The task at the head of the mailbox.
  */
diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 89a77276d6..f9dd9919d7 100644
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -146,7 +146,7 @@ XBT_PUBLIC_CLASS Actor {
     };
   }
 
-  Actor(smx_process_t pimpl) : pimpl_(pimpl) {}
+  explicit Actor(smx_process_t pimpl) : pimpl_(pimpl) {}
 
 public: