Get ride of ???Ptr types in C++: make pointers explicit

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index b3cd6f9..6574473 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -24,25 +24,21 @@ void surf_network_model_init_Constant()
 
   sg_platf_host_add_cb(netcste_count_hosts);
 
-  ModelPtr model = surf_network_model;
+  Model *model = surf_network_model;
   xbt_dynar_push(model_list, &model);
 }
 
 double NetworkConstantModel::shareResources(double /*now*/)
 {
-  NetworkConstantActionPtr action = NULL;
+  NetworkConstantAction *action = NULL;
   double min = -1.0;
 
-  ActionListPtr actionSet = getRunningActionSet();
+  ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
         ; it != itend ; ++it) {
-       action = static_cast<NetworkConstantActionPtr>(&*it);
-    if (action->m_latency > 0) {
-      if (min < 0)
-        min = action->m_latency;
-      else if (action->m_latency < min)
-        min = action->m_latency;
-    }
+       action = static_cast<NetworkConstantAction*>(&*it);
+        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+            min = action->m_latency;
   }
 
   return min;
@@ -50,12 +46,12 @@ double NetworkConstantModel::shareResources(double /*now*/)
 
 void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 {
-  NetworkConstantActionPtr action = NULL;
-  ActionListPtr actionSet = getRunningActionSet();
+  NetworkConstantAction *action = NULL;
+  ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
      ; it != itend ; it=itNext) {
     ++itNext;
-       action = static_cast<NetworkConstantActionPtr>(&*it);
+       action = static_cast<NetworkConstantAction*>(&*it);
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
         double_update(&(action->m_latency), delta, sg_surf_precision);
@@ -78,14 +74,14 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
   }
 }
 
-ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
                                         double size, double rate)
 {
   char *src_name = src->getName();
   char *dst_name = dst->getName();
 
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
-  NetworkConstantActionPtr action = new NetworkConstantAction(this, size, sg_latency_factor);
+  NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
   XBT_OUT();
 
   surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
@@ -145,12 +141,10 @@ void NetworkConstantAction::cancel()
   return;
 }
 
-#ifdef HAVE_TRACING
 void NetworkConstantAction::setCategory(const char */*category*/)
 {
   //ignore completely the categories in constant model, they are not traced
 }
-#endif
 
 void NetworkConstantAction::suspend()
 {