From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 25 Jun 2021 06:50:15 +0000 (+0200)
Subject: More int -> unsigned long.
X-Git-Tag: v3.28~56
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/eef40db17a95c126d7069019b52e3e43a3ea6d49

More int -> unsigned long.
---

diff --git a/include/simgrid/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp
index 6799e29d3b..66e41647bc 100644
--- a/include/simgrid/kernel/routing/DijkstraZone.hpp
+++ b/include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -28,7 +28,7 @@ class XBT_PRIVATE DijkstraZone : public RoutedZone {
       xbt_graph_new_graph(1, nullptr), &DijkstraZone::route_graph_delete};
   std::map<int, xbt_node_t> graph_node_map_;
   bool cached_;
-  std::map<int, std::vector<int>> route_cache_;
+  std::map<int, std::vector<unsigned long>> route_cache_;
 
   xbt_node_t route_graph_new_node(int id);
   xbt_node_t node_map_search(int id);
diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp
index f523f59a4b..bb224b6b0e 100644
--- a/src/kernel/routing/DijkstraZone.cpp
+++ b/src/kernel/routing/DijkstraZone.cpp
@@ -113,8 +113,8 @@ void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rou
     insert_link_latency(route->link_list_, e_route->link_list_, lat);
   }
 
-  auto elm                   = route_cache_.emplace(src_id, std::vector<int>());
-  std::vector<int>& pred_arr = elm.first->second;
+  auto elm                             = route_cache_.emplace(src_id, std::vector<unsigned long>());
+  std::vector<unsigned long>& pred_arr = elm.first->second;
 
   if (elm.second) { /* new element was inserted (not cached mode, or cache miss) */
     unsigned long nr_nodes = xbt_dynar_length(nodes);
@@ -165,7 +165,7 @@ void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rou
   NetPoint* gw_src   = nullptr;
   NetPoint* first_gw = nullptr;
 
-  for (unsigned int v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
+  for (unsigned long v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
     const s_xbt_node_t* node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
     const s_xbt_node_t* node_v      = xbt_dynar_get_as(nodes, v, xbt_node_t);
     const s_xbt_edge_t* edge        = xbt_graph_get_edge(route_graph_.get(), node_pred_v, node_v);