X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67d66b0cf79b9fc02c0450f254584693dbf21d3b..3d29bfd79c15e5a392767fe6a9dfbe8bfedd08b1:/teshsuite/platforms/flatifier.cpp

diff --git a/teshsuite/platforms/flatifier.cpp b/teshsuite/platforms/flatifier.cpp
index 2ab089a7f3..ad9ca31071 100644
--- a/teshsuite/platforms/flatifier.cpp
+++ b/teshsuite/platforms/flatifier.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,7 +9,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Link.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
 #include <algorithm>
 #include <cstring>
@@ -58,8 +58,8 @@ static void dump_hosts()
     }
     // Sort the properties before displaying them, so that the tests are perfectly reproducible
     std::vector<std::string> keys;
-    for (auto const& kv : *props)
-      keys.push_back(kv.first);
+    for (auto const& [key, _] : *props)
+      keys.push_back(key);
     if (not keys.empty()) {
       std::printf(">\n");
       std::sort(keys.begin(), keys.end());
@@ -119,7 +119,7 @@ static void dump_routes()
   for (auto src_host : hosts) { // Routes from host
     const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
     for (auto dst_host : hosts) { // Routes to host
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint();
       simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
       if (route.empty())
@@ -134,7 +134,7 @@ static void dump_routes()
       if (not dst->is_router())
         continue;
       std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", src_host->get_cname(), dst->get_cname());
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
       for (auto const& link : route)
         std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
@@ -148,7 +148,7 @@ static void dump_routes()
     for (auto const& value2 : netpoints) { // to router
       if (not value2->is_router())
         continue;
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
       if (route.empty())
         continue;
@@ -159,7 +159,7 @@ static void dump_routes()
     }
     for (auto dst_host : hosts) { // Routes to host
       std::printf("  <route src=\"%s\" dst=\"%s\">\n  ", value1->get_cname(), dst_host->get_cname());
-      std::vector<simgrid::kernel::resource::LinkImpl*> route;
+      std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
       const simgrid::kernel::routing::NetPoint* netcardDst = dst_host->get_netpoint();
       simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
       for (auto const& link : route)