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

diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h
index ce7ec7a..9b52f4e 100644 (file)
--- a/include/surf/surf_routing.h
+++ b/include/surf/surf_routing.h
@@ -18,8 +18,6 @@ XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level
 XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
 XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
 XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL;  // Surf storage level
-XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
-XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL;   //Routing storage_type level
 
 SG_END_DECL()