X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..5f1c0df379bb5f92fee1193d413c8bd57b89e3a5:/src/surf/surf_routing_RoutedGraph.hpp diff --git a/src/surf/surf_routing_RoutedGraph.hpp b/src/surf/surf_routing_RoutedGraph.hpp index 9d5c7db726..c21833de59 100644 --- a/src/surf/surf_routing_RoutedGraph.hpp +++ b/src/surf/surf_routing_RoutedGraph.hpp @@ -7,6 +7,7 @@ #include #include "surf_routing.hpp" +#include "simgrid/s4u/as.hpp" #ifndef SURF_ROUTING_GENERIC_HPP_ #define SURF_ROUTING_GENERIC_HPP_ @@ -16,13 +17,15 @@ namespace surf { class XBT_PRIVATE AsRoutedGraph; -class XBT_PRIVATE AsRoutedGraph : public As { +class XBT_PRIVATE AsRoutedGraph : public s4u::As { public: AsRoutedGraph(const char*name); ~AsRoutedGraph(); + xbt_dynar_t getOneLinkRoutes() override; + virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override; - virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order); + virtual sg_platf_route_cbarg_t newExtendedRoute(s4u::As::RoutingKind hierarchy, sg_platf_route_cbarg_t routearg, int change_order); protected: void getRouteCheckParams(NetCard *src, NetCard *dst); void addRouteCheckParams(sg_platf_route_cbarg_t route);