reindent that one to please gcc6 too

[simgrid.git] / src / surf / vm_hl13.cpp

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index 35225d0..35b7b7b 100644 (file)
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -108,16 +108,16 @@ double VMHL13Model::shareResources(double now)
 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
       this, typeid(surf_cpu_model_pm ).name(), min_by_cpu,
-               typeid(surf_network_model).name(), min_by_net,
+          typeid(surf_network_model).name(), min_by_net,
             typeid(surf_storage_model).name(), min_by_sto);
 
   double ret = std::max(std::max(min_by_cpu, min_by_net), min_by_sto);
   if (min_by_cpu >= 0.0 && min_by_cpu < ret)
-       ret = min_by_cpu;
+  ret = min_by_cpu;
   if (min_by_net >= 0.0 && min_by_net < ret)
-       ret = min_by_net;
+  ret = min_by_net;
   if (min_by_sto >= 0.0 && min_by_sto < ret)
-       ret = min_by_sto;
+  ret = min_by_sto;
 
   return ret;
 }
@@ -158,7 +158,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos
 
   /* We create cpu_action corresponding to a VM process on the host operating system. */
   /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
-  p_action = sub_cpu->execute(0);
+  p_action = sub_cpu->execution_start(0);
 
   XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks",
     name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
@@ -212,7 +212,7 @@ void VMHL13::migrate(sg_host_t host_dest)
    /* Update vcpu's action for the new pm */
    {
      /* create a cpu action bound to the pm model at the destination. */
-     CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execute(0));
+     CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execution_start(0));
 
      e_surf_action_state_t state = p_action->getState();
      if (state != SURF_ACTION_DONE)