fix dist

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

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 5209a95..9f846b5 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -9,7 +9,7 @@
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/kernel/routing/RoutedZone.hpp"
 #include "src/surf/network_interface.hpp"
 
@@ -82,14 +82,16 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
         continue;
 
       sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-      route->link_list             = new std::vector<Link*>();
+      route->link_list             = new std::vector<surf::LinkImpl*>();
 
       getLocalRoute(my_src, my_dst, route, nullptr);
 
       XBT_DEBUG("get_route_and_latency %s -> %s", my_src->cname(), my_dst->cname());
 
-      xbt_node_t current, previous;
-      const char *previous_name, *current_name;
+      xbt_node_t current;
+      xbt_node_t previous;
+      const char *previous_name;
+      const char *current_name;
 
       if (route->gw_src) {
         previous      = new_xbt_graph_node(graph, route->gw_src->cname(), nodes);
@@ -100,7 +102,7 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
       }
 
       for (auto link : *route->link_list) {
-        const char* link_name = link->getName();
+        const char* link_name = link->cname();
         current               = new_xbt_graph_node(graph, link_name, nodes);
         current_name          = link_name;
         new_xbt_graph_edge(graph, previous, current, edges);
@@ -134,7 +136,7 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
   sg_platf_route_cbarg_t result;
 
   result            = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-  result->link_list = new std::vector<Link*>();
+  result->link_list = new std::vector<surf::LinkImpl*>();
 
   xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
              "The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here.");
@@ -157,7 +159,7 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
   return result;
 }
 
-void RoutedZone::getRouteCheckParams(NetCard* src, NetCard* dst)
+void RoutedZone::getRouteCheckParams(NetPoint* src, NetPoint* dst)
 {
   xbt_assert(src, "Cannot find a route from nullptr to %s", dst->cname());
   xbt_assert(dst, "Cannot find a route from %s to nullptr", src->cname());
@@ -175,8 +177,8 @@ void RoutedZone::getRouteCheckParams(NetCard* src, NetCard* dst)
 }
 void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
 {
-  NetCard* src        = route->src;
-  NetCard* dst        = route->dst;
+  NetPoint* src       = route->src;
+  NetPoint* dst       = route->dst;
   const char* srcName = src->cname();
   const char* dstName = dst->cname();