X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dd253f0ff4dda733dd0f7c924a25df4b777f0d0..26ba5558401021cb3854f2f1a5ffedd7044f6823:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index 135b6246d3..23242f73a3 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -17,13 +17,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic imple /* ***************************************************************** */ /* *********************** GENERIC METHODS ************************* */ -static const char* instr_node_name(xbt_node_t node) +static const char* instr_node_name(const s_xbt_node_t* node) { const void* data = xbt_graph_node_get_data(node); return static_cast(data); } -xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, std::map* nodes) +xbt_node_t new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name, std::map* nodes) { auto elm = nodes->find(name); if (elm == nodes->end()) { @@ -34,7 +34,8 @@ xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, std::mapsecond; } -xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, std::map* edges) +xbt_edge_t new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t s, xbt_node_t d, + std::map* edges) { const char* sn = instr_node_name(s); const char* dn = instr_node_name(d); @@ -63,7 +64,7 @@ RoutedZone::RoutedZone(NetZoneImpl* father, const std::string& name, resource::N { } -void RoutedZone::get_graph(xbt_graph_t graph, std::map* nodes, +void RoutedZone::get_graph(const s_xbt_graph_t* graph, std::map* nodes, std::map* edges) { std::vector vertices = get_vertices(); @@ -166,7 +167,7 @@ void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) src->get_cname(), dst->get_cname(), src_as->get_cname(), dst_as->get_cname(), get_cname()); } void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) { const char* srcName = src->get_cname(); const char* dstName = dst->get_cname();