kill a type that were exactly the same than another

[simgrid.git] / src / surf / surf_routing_dijkstra.c

diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c
index 9e58253..c2224b4 100644 (file)
--- a/src/surf/surf_routing_dijkstra.c
+++ b/src/surf/surf_routing_dijkstra.c
@@ -9,7 +9,7 @@
 /* Global vars */
 extern routing_global_t global_routing;
 extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 
@@ -448,8 +448,8 @@ routing_component_t model_dijkstra_both_create(int cached)
   routing_component_dijkstra_t new_component = (routing_component_dijkstra_t)
       routmod_generic_create(sizeof(s_routing_component_dijkstra_t));
 
-  new_component->generic_routing.set_route = model_dijkstra_both_set_route;
-  new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
+  new_component->generic_routing.parse_route = model_dijkstra_both_parse_route;
+  new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route;
   new_component->generic_routing.get_route = dijkstra_get_route;
   new_component->generic_routing.get_onelink_routes =
       dijkstra_get_onelink_routes;
@@ -500,8 +500,8 @@ void model_dijkstra_both_end(void)
   }
 
 }
-void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
-                     const char *dst, name_route_extended_t route)
+void model_dijkstra_both_parse_route (routing_component_t rc, const char *src,
+                     const char *dst, route_extended_t route)
 {
        routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
        int *src_id, *dst_id;