X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..29a81842d533739990e76a90f1e26b90ff263586:/src/kernel/activity/MailboxImpl.hpp diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index 3ebc417cdf..bfd5bafdc3 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -27,8 +27,8 @@ class MailboxImpl { } public: - const simgrid::xbt::string& getName() const { return name_; } - const char* getCname() const { return name_.c_str(); } + const simgrid::xbt::string& get_name() const { return name_; } + const char* get_cname() const { return name_.c_str(); } static MailboxImpl* byNameOrNull(const char* name); static MailboxImpl* byNameOrCreate(const char* name); void setReceiver(s4u::ActorPtr actor); @@ -37,7 +37,7 @@ public: simgrid::s4u::Mailbox piface_; // Our interface simgrid::xbt::string name_; - simgrid::simix::ActorImplPtr permanent_receiver; // process which the mailbox is attached to + simgrid::kernel::actor::ActorImplPtr permanent_receiver; // actor to which the mailbox is attached boost::circular_buffer_space_optimized comm_queue; boost::circular_buffer_space_optimized done_comm_queue; // messages already received in the permanent receive mode };