From 147c2e11ceb3b0c4e10270bcba4c89700f7c8b04 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 13 Jul 2018 22:16:46 +0200 Subject: [PATCH] stringify s4u::VirtualMachine, so all s4u is stringified --- include/simgrid/s4u/VirtualMachine.hpp | 4 ++-- src/plugins/vm/s4u_VirtualMachine.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index f7bb2c7b5c..bdbff23b15 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -24,8 +24,8 @@ class XBT_PUBLIC VirtualMachine : public s4u::Host { virtual ~VirtualMachine(); public: - explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount); - explicit VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize); + explicit VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount); + explicit VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount, size_t ramsize); // No copy/move VirtualMachine(VirtualMachine const&) = delete; diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index 6f0dbe580b..9a26e932f8 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -24,12 +24,12 @@ simgrid::xbt::signal VirtualMachine::on_resume; simgrid::xbt::signal VirtualMachine::on_migration_start; simgrid::xbt::signal VirtualMachine::on_migration_end; -VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount) +VirtualMachine::VirtualMachine(std::string name, s4u::Host* physical_host, int core_amount) : VirtualMachine(name, physical_host, core_amount, 1024) { } -VirtualMachine::VirtualMachine(const char* name, s4u::Host* physical_host, int core_amount, size_t ramsize) +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); -- 2.20.1