X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da9e3460f9f8e4eb2ad4c523a19a8ddb79807e60..5bc3597e1513c7b94497ae0ea819e5fa2e28058a:/src/kernel/routing/DijkstraZone.hpp diff --git a/src/kernel/routing/DijkstraZone.hpp b/src/kernel/routing/DijkstraZone.hpp index bf443fb83e..29e8b90c79 100644 --- a/src/kernel/routing/DijkstraZone.hpp +++ b/src/kernel/routing/DijkstraZone.hpp @@ -11,16 +11,19 @@ typedef struct graph_node_data { int id; int graph_id; /* used for caching internal graph id's */ -} s_graph_node_data_t, *graph_node_data_t; +} s_graph_node_data_t; +typedef s_graph_node_data_t* graph_node_data_t; typedef struct graph_node_map_element { xbt_node_t node; -} s_graph_node_map_element_t, *graph_node_map_element_t; +} s_graph_node_map_element_t; +typedef s_graph_node_map_element_t* graph_node_map_element_t; typedef struct route_cache_element { int* pred_arr; int size; -} s_route_cache_element_t, *route_cache_element_t; +} s_route_cache_element_t; +typedef s_route_cache_element_t* route_cache_element_t; namespace simgrid { namespace kernel { @@ -40,7 +43,7 @@ namespace routing { */ class XBT_PRIVATE DijkstraZone : public RoutedZone { public: - DijkstraZone(NetZone* father, const char* name, bool cached); + DijkstraZone(NetZone* father, std::string name, bool cached); void seal() override; ~DijkstraZone() override; @@ -58,7 +61,7 @@ public: * After this function returns, any node in the graph * will have a loopback attached to it. */ - void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) override; + void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) override; void addRoute(sg_platf_route_cbarg_t route) override; xbt_graph_t routeGraph_ = nullptr; /* xbt_graph */