Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_routing_RoutedGraph.hpp

diff --git a/src/surf/surf_routing_RoutedGraph.hpp b/src/surf/surf_routing_RoutedGraph.hpp
index dcb5ee6..c21833d 100644 (file)
--- a/src/surf/surf_routing_RoutedGraph.hpp
+++ b/src/surf/surf_routing_RoutedGraph.hpp
@@ -7,6 +7,7 @@
 #include <xbt/base.h>
 
 #include "surf_routing.hpp"
+#include "simgrid/s4u/as.hpp"
 
 #ifndef SURF_ROUTING_GENERIC_HPP_
 #define SURF_ROUTING_GENERIC_HPP_
@@ -16,23 +17,18 @@ 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();
 
-  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
-  virtual sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst, double *lat) override;
-
-  /* Add content to the AS, at parsing time */
-  virtual void parseBypassroute(sg_platf_route_cbarg_t e_route) override;
+  xbt_dynar_t getOneLinkRoutes() override;
 
-  virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order);
+  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+  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);
-private:
-  xbt_dict_t bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);
 };
 
 }