X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e53e94eb6cb9f8edda78234ec8a0ba7880431d2a..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/include/simgrid/kernel/routing/StarZone.hpp

diff --git a/include/simgrid/kernel/routing/StarZone.hpp b/include/simgrid/kernel/routing/StarZone.hpp
index 575b60ff45..dcf740c066 100644
--- a/include/simgrid/kernel/routing/StarZone.hpp
+++ b/include/simgrid/kernel/routing/StarZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2023. 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. */
@@ -69,15 +69,15 @@ public:
                  std::map<std::string, xbt_edge_t, std::less<>>* edges) override;
 
   void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                 const std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical) override;
+                 const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical) override;
   void do_seal() override;
 
 private:
   class StarRoute {
   public:
-    std::vector<resource::LinkImpl*> links_up;   //!< list of links UP for route (can be empty)
-    std::vector<resource::LinkImpl*> links_down; //!< list of links DOWN for route (can be empty)
-    std::vector<resource::LinkImpl*> loopback;   //!< loopback links, cannot be empty if configured
+    std::vector<resource::StandardLinkImpl*> links_up;   //!< list of links UP for route (can be empty)
+    std::vector<resource::StandardLinkImpl*> links_down; //!< list of links DOWN for route (can be empty)
+    std::vector<resource::StandardLinkImpl*> loopback;   //!< loopback links, cannot be empty if configured
     bool links_up_set   = false;                 //!< bool to indicate that links_up was configured (empty or not)
     bool links_down_set = false;                 //!< same for links_down
     NetPoint* gateway   = nullptr;
@@ -86,12 +86,12 @@ private:
     bool has_links_down() const { return links_down_set; }
   };
   /** @brief Auxiliary method to add links to a route */
-  void add_links_to_route(const std::vector<resource::LinkImpl*>& links, Route* route, double* latency,
-                          std::unordered_set<resource::LinkImpl*>& added_links) const;
+  void add_links_to_route(const std::vector<resource::StandardLinkImpl*>& links, Route* route, double* latency,
+                          std::unordered_set<resource::StandardLinkImpl*>& added_links) const;
   /** @brief Auxiliary methods to check params received in add_route method */
-  void check_add_route_param(const NetPoint* src, const NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+  void check_add_route_param(const NetPoint* src, const NetPoint* dst, const NetPoint* gw_src, const NetPoint* gw_dst,
                              bool symmetrical) const;
-  std::unordered_map<unsigned int, StarRoute> routes_;
+  std::unordered_map<unsigned long, StarRoute> routes_;
 };
 } // namespace routing
 } // namespace kernel