merge conflicts

[simgrid.git] / teshsuite / simdag / platforms / is_router_test.c

diff --git a/teshsuite/simdag/platforms/is_router_test.c b/teshsuite/simdag/platforms/is_router_test.c
index df14488..d9dcd42 100644 (file)
--- a/teshsuite/simdag/platforms/is_router_test.c
+++ b/teshsuite/simdag/platforms/is_router_test.c
@@ -22,19 +22,19 @@ int main(int argc, char **argv)
   /* creation of the environment */
   SD_create_environment(argv[1]);
 
-  size = xbt_lib_size(host_lib) + xbt_lib_size(as_router_lib);
+  size = xbt_lib_length(host_lib) + xbt_lib_length(as_router_lib);
 
   printf("Workstation number: %d, link number: %d, elmts number: %d\n",
          SD_workstation_get_number(), SD_link_get_number(), size);
 
   xbt_lib_foreach(host_lib, cursor, key, data) {
     printf("   - Seen: \"%s\" is type : %d\n", key,
-           (int) global_routing->get_network_element_type(key));
+           (int) routing_get_network_element_type(key));
   }
 
   xbt_lib_foreach(as_router_lib, cursor, key, data) {
     printf("   - Seen: \"%s\" is type : %d\n", key,
-           (int) global_routing->get_network_element_type(key));
+           (int) routing_get_network_element_type(key));
   }
 
   SD_exit();