X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e77b2fa8cd2972d18eeae2094309fc105869168..4af3b3329ad57dcfe30cf363b3f79f209c32a4ac:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 8bbd64268e..cac3a8698d 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -6,6 +6,7 @@ #include "simgrid/s4u/Engine.hpp" #include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -75,9 +76,9 @@ double surf_solve(double max_date) if (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you if (next_event_date != -1.0) { - time_delta = MIN(next_event_date - NOW, time_delta); + time_delta = std::min(next_event_date - NOW, time_delta); } else { - time_delta = MAX(next_event_date - NOW, time_delta); // Get the positive component + time_delta = std::max(next_event_date - NOW, time_delta); // Get the positive component } XBT_DEBUG("Run the NS3 network at most %fs", time_delta);