X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2311587e43b425e0fc6acf2d3de39d6a38ef8a56..500491a76fe5e03d18ae705d2d7a7d28571fbb47:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index f25ebdfd7b..f195f6af39 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -28,7 +28,7 @@ namespace simgrid {
 namespace surf {
 HostCLM03Model::HostCLM03Model()
 {
-  all_existing_models->push_back(this);
+  all_existing_models.push_back(this);
 }
 double HostCLM03Model::next_occuring_event(double now)
 {
@@ -44,12 +44,10 @@ double HostCLM03Model::next_occuring_event(double now)
       typeid(surf_network_model).name(), min_by_net,
       typeid(surf_storage_model).name(), min_by_sto);
 
-  double res = std::max({min_by_cpu, min_by_net, min_by_sto});
-  if (min_by_cpu >= 0.0 && min_by_cpu < res)
-    res = min_by_cpu;
-  if (min_by_net >= 0.0 && min_by_net < res)
+  double res = min_by_cpu;
+  if (res < 0 || (min_by_net >= 0.0 && min_by_net < res))
     res = min_by_net;
-  if (min_by_sto >= 0.0 && min_by_sto < res)
+  if (res < 0 || (min_by_sto >= 0.0 && min_by_sto < res))
     res = min_by_sto;
   return res;
 }