X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38906765bf812b1c32df889f3ce7e72bb58e1326..5e00312bf86c3868d644b7806cdba0abf23664a4:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 0c95e43d7c..a60b0bf526 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -10,9 +10,9 @@
 
 #include "host_clm03.hpp"
 
+#include "VirtualMachineImpl.hpp"
 #include "cpu_cas01.hpp"
 #include "simgrid/sg_config.h"
-#include "virtual_machine.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 
@@ -46,14 +46,12 @@ void surf_host_model_init_compound()
 namespace simgrid {
 namespace surf {
 
-HostCLM03Model::~HostCLM03Model() {}
-
-double HostCLM03Model::next_occuring_event(double now){
+double HostCLM03Model::nextOccuringEvent(double now){
   adjustWeightOfDummyCpuActions();
 
-  double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
-  double min_by_net = surf_network_model->next_occuring_event_isIdempotent() ? surf_network_model->next_occuring_event(now) : -1;
-  double min_by_sto = surf_storage_model->next_occuring_event(now);
+  double min_by_cpu = surf_cpu_model_pm->nextOccuringEvent(now);
+  double min_by_net = surf_network_model->nextOccuringEventIsIdempotent() ? surf_network_model->nextOccuringEvent(now) : -1;
+  double min_by_sto = surf_storage_model->nextOccuringEvent(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,