X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/RoutedZone.hpp

diff --git a/src/kernel/routing/RoutedZone.hpp b/src/kernel/routing/RoutedZone.hpp
index 74e655bc30..1a874b060b 100644
--- a/src/kernel/routing/RoutedZone.hpp
+++ b/src/kernel/routing/RoutedZone.hpp
@@ -52,21 +52,27 @@ class XBT_PRIVATE RoutedZone : public NetZoneImpl {
 public:
   explicit RoutedZone(NetZone* father, std::string name);
 
-  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
-  virtual sg_platf_route_cbarg_t newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg,
-                                                  bool change_order);
+  void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+                std::map<std::string, xbt_edge_t>* edges) override;
+  virtual RouteCreationArgs* newExtendedRoute(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src,
+                                              NetPoint* gw_dst, std::vector<simgrid::surf::LinkImpl*>& link_list,
+                                              bool symmetrical, bool change_order);
 
 protected:
   void getRouteCheckParams(NetPoint* src, NetPoint* dst);
-  void addRouteCheckParams(sg_platf_route_cbarg_t route);
+  void addRouteCheckParams(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+                           std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical);
 };
 }
 }
 } // namespace
 
 extern "C" {
-XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, xbt_dict_t nodes);
-XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
+XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
+                                          std::map<std::string, xbt_node_t>* nodes);
+XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d,
+                                          std::map<std::string, xbt_edge_t>* edges);
 }
 
 #endif /* SIMGRID_ROUTING_GENERIC_HPP_ */