X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7cd7ddd52235514ae35982529da77668e261b756..eabd83894de59f28621ce9dd1148cf070446d934:/src/kernel/routing/AsCluster.cpp

diff --git a/src/kernel/routing/AsCluster.cpp b/src/kernel/routing/AsCluster.cpp
index 94e2f14afb..1056f766e9 100644
--- a/src/kernel/routing/AsCluster.cpp
+++ b/src/kernel/routing/AsCluster.cpp
@@ -14,10 +14,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"
 namespace simgrid {
 namespace kernel {
 namespace routing {
-  AsCluster::AsCluster(const char*name)
-    : AsImpl(name)
-  {}
-  AsCluster::~AsCluster()=default;
+AsCluster::AsCluster(As* father, const char* name) : AsImpl(father, name)
+{
+}
+AsCluster::~AsCluster() = default;
 
 void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
 {
@@ -31,7 +31,7 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
       info = privateLinks_.at(src->id() * linkCountPerNode_);
       route->link_list->push_back(info.linkUp);
       if (lat)
-        *lat += info.linkUp->getLatency();
+        *lat += info.linkUp->latency();
       return;
     }
 
@@ -45,7 +45,7 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
     if (info.linkUp) {         // link up
       route->link_list->push_back(info.linkUp);
       if (lat)
-        *lat += info.linkUp->getLatency();
+        *lat += info.linkUp->latency();
     }
 
   }
@@ -53,7 +53,7 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
   if (backbone_) {
     route->link_list->push_back(backbone_);
     if (lat)
-      *lat += backbone_->getLatency();
+      *lat += backbone_->latency();
   }
 
   if (! dst->isRouter()) {    // No specific link for router
@@ -62,7 +62,7 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
     if (info.linkDown) {       // link down
       route->link_list->push_back(info.linkDown);
       if (lat)
-        *lat += info.linkDown->getLatency();
+        *lat += info.linkDown->latency();
     }
     if (hasLimiter_){          // limiter for receiver
         info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
@@ -146,7 +146,7 @@ void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
     info.linkUp = Link::byName(link_id);
     info.linkDown = info.linkUp;
   }
-  privateLinks_.insert(privateLinks_.begin()+position, info);
+  privateLinks_.insert({position, info});
   xbt_free(link_id);
 }