reduce the scope of some #include, and cut useless ones

[simgrid.git] / src / plugins / vm / VmLiveMigration.hpp

diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp
index 39cde37..257faeb 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.hpp
+++ b/src/plugins/vm/VmLiveMigration.hpp
@@ -1,9 +1,12 @@
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
 
-#include "simgrid/s4u.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/VirtualMachine.hpp"
 
 #ifndef VM_LIVE_MIGRATION_HPP_
 #define VM_LIVE_MIGRATION_HPP_
@@ -37,10 +40,10 @@ public:
   {
     src_pm_ = vm_->getPm();
 
-    mbox_ctl = s4u::Mailbox::byName(std::string("__mbox_mig_ctl:") + vm_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                    dst_pm_->getCname() + ")");
-    mbox = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                dst_pm_->getCname() + ")");
+    mbox_ctl = s4u::Mailbox::byName(std::string("__mbox_mig_ctl:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                    "-" + dst_pm_->get_cname() + ")");
+    mbox     = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                "-" + dst_pm_->get_cname() + ")");
   }
   void operator()();
 };
@@ -56,8 +59,8 @@ public:
   explicit MigrationTx(s4u::VirtualMachine* vm, s4u::Host* dst_pm) : vm_(vm), dst_pm_(dst_pm)
   {
     src_pm_ = vm_->getPm();
-    mbox = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->getCname() + "(" + src_pm_->getCname() + "-" +
-                                dst_pm_->getCname() + ")");
+    mbox    = s4u::Mailbox::byName(std::string("__mbox_mig_src_dst:") + vm_->get_cname() + "(" + src_pm_->get_cname() +
+                                "-" + dst_pm_->get_cname() + ")");
   }
   void operator()();
   sg_size_t sendMigrationData(sg_size_t size, int stage, int stage2_round, double mig_speed, double timeout);