X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5484101efbff9c8d982a0c4650f7953ee7e2f..b5f9e42977485f8fb5f5818e45182bc7f6feaba9:/src/kernel/routing/VivaldiZone.cpp

diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp
index 9f27b1bcf6..eceb3f7ae5 100644
--- a/src/kernel/routing/VivaldiZone.cpp
+++ b/src/kernel/routing/VivaldiZone.cpp
@@ -8,7 +8,6 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"
 
 #include <boost/algorithm/string.hpp>
@@ -52,7 +51,7 @@ static inline double euclidean_dist_comp(double src_coord, double dst_coord)
 
 static const std::vector<double>& netpoint_get_coords(NetPoint* np)
 {
-  auto* coords = np->extension<vivaldi::Coords>();
+  const auto* coords = np->extension<vivaldi::Coords>();
   xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
              (np->is_netzone() ? "Netzone" : (np->is_host() ? "Host" : "Router")), np->get_cname(), np);
   return coords->coords;
@@ -65,21 +64,21 @@ void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out)
 
   std::string link_up        = "link_" + netpoint->get_name() + "_UP";
   std::string link_down      = "link_" + netpoint->get_name() + "_DOWN";
-  auto* linkUp               = create_link(link_up, std::vector<double>{bw_out})->seal();
-  auto* linkDown             = create_link(link_down, std::vector<double>{bw_in})->seal();
+  const auto* linkUp         = create_link(link_up, std::vector<double>{bw_out})->seal();
+  const auto* linkDown       = create_link(link_down, std::vector<double>{bw_in})->seal();
   add_route(netpoint, nullptr, nullptr, nullptr, {linkUp->get_impl()}, false);
   add_route(nullptr, netpoint, nullptr, nullptr, {linkDown->get_impl()}, false);
 }
 
-void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, Route* route, double* lat)
 {
   XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
 
   if (src->is_netzone()) {
     std::string srcName = "router_" + src->get_name();
     std::string dstName = "router_" + dst->get_name();
-    route->gw_src       = s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName);
-    route->gw_dst       = s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName);
+    route->gw_src_      = s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName);
+    route->gw_dst_      = s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName);
   }
 
   StarZone::get_local_route(src, dst, route, lat);