further cleanups to all our next_occuring_event functions

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 6a0a74a..038b535 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -132,10 +132,9 @@ namespace simgrid {
     double NetworkModel::next_occuring_event_full(double now)
     {
       ActionList *runningActions = surf_network_model->getRunningActionSet();
-      double minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
+      double minRes = shareResourcesMaxMin(runningActions, maxminSystem_, f_networkSolve);
 
-      for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
-          ; it != itend ; ++it) {
+      for(auto it(runningActions->begin()), itend(runningActions->end()); it != itend ; ++it) {
         NetworkAction *action = static_cast<NetworkAction*>(&*it);
         if (action->latency_ > 0)
           minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);