X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27e5a1eebe0cc33508692e868ae7b369f4a482b4..2aadff70152b2c1953b5776045da0ad05b5ac44d:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index f590295df9..2f78a0de72 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -172,7 +172,7 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/) } } -void NetworkCm02Model::update_actions_state_full(double now, double delta) +void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta) { for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { NetworkCm02Action& action = static_cast(*it); @@ -199,11 +199,11 @@ void NetworkCm02Model::update_actions_state_full(double now, double delta) } action.update_remains(action.get_variable()->get_value() * delta); - if (action.get_max_duration() > NO_MAX_DURATION) + if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || - ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { action.finish(Action::State::FINISHED); } }