Use boost::range algorithms

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 42e6792..e76df1d 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -46,6 +46,8 @@ void surf_host_model_init_compound()
 namespace simgrid {
 namespace surf {
 
+HostCLM03Model::~HostCLM03Model() {}
+
 double HostCLM03Model::next_occuring_event(double now){
   adjustWeightOfDummyCpuActions();
 
@@ -58,7 +60,7 @@ 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(std::max(min_by_cpu, min_by_net), 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)