snake_case routing::NetPoint

[simgrid.git] / include / simgrid / kernel / routing / DijkstraZone.hpp

diff --git a/include/simgrid/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp
index 2003a9a..c435463 100644 (file)
--- a/include/simgrid/kernel/routing/DijkstraZone.hpp
+++ b/include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -33,13 +33,17 @@ namespace routing {
  */
 class XBT_PRIVATE DijkstraZone : public RoutedZone {
 public:
-  DijkstraZone(NetZone* father, std::string name, bool cached);
+  DijkstraZone(NetZoneImpl* father, std::string name, bool cached);
   void seal() override;
 
   ~DijkstraZone() override;
-  xbt_node_t routeGraphNewNode(int id, int graph_id);
-  xbt_node_t nodeMapSearch(int id);
-  void newRoute(int src_id, int dst_id, RouteCreationArgs* e_route);
+
+private:
+  xbt_node_t route_graph_new_node(int id, int graph_id);
+  xbt_node_t node_map_search(int id);
+  void new_route(int src_id, int dst_id, RouteCreationArgs* e_route);
+
+public:
   /* For each vertex (node) already in the graph,
    * make sure it also has a loopback link; this loopback
    * can potentially already be in the graph, and in that
@@ -53,7 +57,7 @@ public:
    */
   void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) override;
   void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                 std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
+                 std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
 
   xbt_graph_t route_graph_ = nullptr;          /* xbt_graph */
   std::map<int, xbt_node_t> graph_node_map_;   /* map */