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

diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp
index 39666c092b..3364f033c7 100644
--- a/src/kernel/routing/VivaldiZone.cpp
+++ b/src/kernel/routing/VivaldiZone.cpp
@@ -9,6 +9,7 @@
 #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>
 
@@ -71,8 +72,8 @@ void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, s
 
   std::string link_up      = "link_" + netpoint->get_name() + "_UP";
   std::string link_down    = "link_" + netpoint->get_name() + "_DOWN";
-  surf::LinkImpl* linkUp   = surf_network_model->createLink(link_up, bw_out, 0, SURF_LINK_SHARED);
-  surf::LinkImpl* linkDown = surf_network_model->createLink(link_down, bw_in, 0, SURF_LINK_SHARED);
+  resource::LinkImpl* linkUp   = surf_network_model->createLink(link_up, bw_out, 0, s4u::Link::SharingPolicy::SHARED);
+  resource::LinkImpl* linkDown = surf_network_model->createLink(link_down, bw_in, 0, s4u::Link::SharingPolicy::SHARED);
   private_links_.insert({netpoint->id(), {linkUp, linkDown}});
 }
 
@@ -83,14 +84,14 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
   if (src->is_netzone()) {
     std::string srcName = "router_" + src->get_name();
     std::string dstName = "router_" + dst->get_name();
-    route->gw_src       = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(srcName.c_str());
-    route->gw_dst       = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(dstName.c_str());
+    route->gw_src       = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(srcName.c_str());
+    route->gw_dst       = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(dstName.c_str());
   }
 
   /* Retrieve the private links */
   auto src_link = private_links_.find(src->id());
   if (src_link != private_links_.end()) {
-    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = src_link->second;
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = src_link->second;
     if (info.first) {
       route->link_list.push_back(info.first);
       if (lat)
@@ -102,7 +103,7 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
 
   auto dst_link = private_links_.find(dst->id());
   if (dst_link != private_links_.end()) {
-    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = dst_link->second;
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = dst_link->second;
     if (info.second) {
       route->link_list.push_back(info.second);
       if (lat)