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

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 49eb817151d2bfa1d95fdca92be1cfa84c6d1873..b82cc834c90b5002dddf2b0a74f2bafbaf3003df 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -291,7 +291,7 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
 
 static XBT_INLINE void routing_asr_host_free(void *p)
 {
-  network_element_t elm = p;
+  sg_routing_edge_t elm = p;
   free(elm->name);
   xbt_free(elm);
 }
@@ -308,15 +308,11 @@ void surf_init(int *argc, char **argv)
   XBT_DEBUG("ADD ROUTING LEVEL");
   ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
   ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
-  ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
-  ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
-  ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
 
   XBT_DEBUG("ADD SURF LEVELS");
   SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
   SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
   SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
-  SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
 
   xbt_init(argc, argv);
   if (!model_list)