ns3: no need for 2 postparse callbacks

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index d5601f0..e68c91d 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -41,8 +41,8 @@ namespace simgrid {
       for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
           ; it != itend ; ++it) {
         action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
-          min = action->m_latency;
+        if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
+          min = action->latency_;
       }
 
       return min;
@@ -56,11 +56,11 @@ namespace simgrid {
           ; it != itend ; it=itNext) {
         ++itNext;
         action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->m_latency > 0) {
-          if (action->m_latency > delta) {
-            double_update(&(action->m_latency), delta, sg_surf_precision);
+        if (action->latency_ > 0) {
+          if (action->latency_ > delta) {
+            double_update(&(action->latency_), delta, sg_surf_precision);
           } else {
-            action->m_latency = 0.0;
+            action->latency_ = 0.0;
           }
         }
         action->updateRemains(action->getCost() * delta / action->m_latInit);
@@ -69,11 +69,11 @@ namespace simgrid {
 
         if (action->getRemainsNoUpdate() <= 0) {
           action->finish();
-          action->setState(SURF_ACTION_DONE);
+          action->setState(Action::State::done);
         } else if ((action->getMaxDuration() != NO_MAX_DURATION)
             && (action->getMaxDuration() <= 0)) {
           action->finish();
-          action->setState(SURF_ACTION_DONE);
+          action->setState(Action::State::done);
         }
       }
     }