make As->father_ protected

[simgrid.git] / src / kernel / routing / AsVivaldi.cpp

diff --git a/src/kernel/routing/AsVivaldi.cpp b/src/kernel/routing/AsVivaldi.cpp
index c25b4e0..a17352e 100644 (file)
--- a/src/kernel/routing/AsVivaldi.cpp
+++ b/src/kernel/routing/AsVivaldi.cpp
@@ -48,8 +48,7 @@ namespace routing {
 
     return res;
   }
-  AsVivaldi::AsVivaldi(const char *name)
-    : AsCluster(name)
+  AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name)
   {}
 
 AsVivaldi::~AsVivaldi() {}
@@ -68,16 +67,16 @@ void AsVivaldi::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
   }
 
   /* Retrieve the private links */
-  if ((int)xbt_dynar_length(privateLinks_) > src->id()) {
-    s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
+  if (privateLinks_.size() > src->id()) {
+    s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id());
     if(info.linkUp) {
       route->link_list->push_back(info.linkUp);
       if (lat)
         *lat += info.linkUp->getLatency();
     }
   }
-  if ((int)xbt_dynar_length(privateLinks_)>dst->id()) {
-    s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, dst->id(), s_surf_parsing_link_up_down_t);
+  if (privateLinks_.size() >dst->id()) {
+    s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id());
     if(info.linkDown) {
       route->link_list->push_back(info.linkDown);
       if (lat)