From: Frederic Suter Date: Mon, 1 May 2017 12:19:09 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3.16~274^2~41^2~10 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/121e1dc6ee0462b6f6f1f1570b0f48c61ee4ff9a?hp=39423c5e63cbaa7fc3c41a4af6037948c4033225 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 ce7ec7afd2..9b52f4ed8e 100644 --- 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()