From 08761e536685c785fa8aae06a819f36fc9d62c80 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 22 Oct 2016 02:19:42 +0200 Subject: [PATCH] cosmetics: use C++ type names --- src/surf/VirtualMachineImpl.cpp | 6 +++--- src/surf/VirtualMachineImpl.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/surf/VirtualMachineImpl.cpp b/src/surf/VirtualMachineImpl.cpp index be319267a0..018f049fad 100644 --- a/src/surf/VirtualMachineImpl.cpp +++ b/src/surf/VirtualMachineImpl.cpp @@ -40,7 +40,7 @@ simgrid::xbt::signal onVmStateChange; std::deque VirtualMachineImpl::allVms_; -s4u::Host* VMModel::createVM(const char* name, sg_host_t host_PM) +s4u::Host* VMModel::createVM(const char* name, s4u::Host* host_PM) { return new s4u::VirtualMachine(name, host_PM); } @@ -182,13 +182,13 @@ void VirtualMachineImpl::restore() } /** @brief returns the physical machine on which the VM is running **/ -sg_host_t VirtualMachineImpl::getPm() +s4u::Host* VirtualMachineImpl::getPm() { return hostPM_; } /* Update the physical host of the given VM */ -void VirtualMachineImpl::migrate(sg_host_t host_dest) +void VirtualMachineImpl::migrate(s4u::Host* host_dest) { const char* vm_name = piface_->name().c_str(); const char* pm_name_src = hostPM_->name().c_str(); diff --git a/src/surf/VirtualMachineImpl.hpp b/src/surf/VirtualMachineImpl.hpp index 99faa0b7f2..ec006462cd 100644 --- a/src/surf/VirtualMachineImpl.hpp +++ b/src/surf/VirtualMachineImpl.hpp @@ -72,10 +72,10 @@ public: virtual void restore(); /** @brief Migrate the VM to the destination host */ - virtual void migrate(sg_host_t dest_PM); + virtual void migrate(s4u::Host* dest); /** @brief Get the physical machine hosting the VM */ - sg_host_t getPm(); + s4u::Host* getPm(); virtual void setBound(double bound); @@ -109,7 +109,7 @@ public: * @param name The name of the new VM * @param host_PM The real machine hosting the VM */ - s4u::Host* createVM(const char* name, sg_host_t host_PM); + s4u::Host* createVM(const char* name, s4u::Host* host_PM); void adjustWeightOfDummyCpuActions() override{}; double nextOccuringEvent(double now) override; -- 2.20.1