From: Martin Quinson Date: Fri, 13 Jul 2018 20:30:52 +0000 (+0200) Subject: fuuuuux the build, sorry X-Git-Tag: v3_21~444 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/adb6ac3567f09ceb1016dfbce03254bdb879c711 fuuuuux the build, sorry --- diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index f7a3357018..f137c545fb 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -22,6 +22,7 @@ namespace activity { class MailboxImpl { friend s4u::Mailbox; + friend s4u::MailboxPtr s4u::Mailbox::by_name(std::string name); explicit MailboxImpl(std::string name) : piface_(this), name_(name), comm_queue_(MAX_MAILBOX_SIZE), done_comm_queue_(MAX_MAILBOX_SIZE) diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 9a26e932f8..bb23fed423 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -32,7 +32,7 @@ VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int c VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount, size_t ramsize) : Host(name), pimpl_vm_(new vm::VirtualMachineImpl(this, physical_host, core_amount, ramsize)) { - XBT_DEBUG("Create VM %s", name); + XBT_DEBUG("Create VM %s", name.c_str()); /* Currently, a VM uses the network resource of its physical host */ pimpl_netpoint = physical_host->pimpl_netpoint;