kill a type that were exactly the same than another

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index f3c2370..101626c 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -38,7 +38,7 @@ static xbt_dict_t random_value = NULL;
 /* Global vars */
 routing_global_t global_routing = NULL;
 routing_component_t current_routing = NULL;
-model_type_t current_routing_model = NULL;
+routing_model_description_t current_routing_model = NULL;
 
 /* global parse functions */
 xbt_dynar_t link_list = NULL;   /* temporary store of current list link of a route */
@@ -228,7 +228,7 @@ static void routing_parse_link_ctn(void)
  */
 static void routing_parse_E_route(void)
 {
-  name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
+  route_extended_t route = xbt_new0(s_route_extended_t, 1);
   route->generic_route.link_list = link_list;
   xbt_assert(current_routing->parse_route,
              "no defined method \"set_route\" in \"%s\"",
@@ -244,7 +244,7 @@ static void routing_parse_E_route(void)
  */
 static void routing_parse_E_ASroute(void)
 {
-  name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1);
+  route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
   e_route->dst_gateway = xbt_strdup(gw_dst);
@@ -295,7 +295,7 @@ static void routing_parse_E_bypassRoute(void)
 void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
 {
   routing_component_t new_routing;
-  model_type_t model = NULL;
+  routing_model_description_t model = NULL;
   int cpt;
 
   /* search the routing model */