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

[simgrid.git] / src / msg / global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index f764ade..55d4b0a 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -110,7 +110,7 @@ void MSG_global_init(int *argc, char **argv)
  */
 MSG_error_t MSG_set_channel_number(int number)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel == 0),
               "Channel number already set!");
 
@@ -128,7 +128,7 @@ MSG_error_t MSG_set_channel_number(int number)
  */
 int MSG_get_channel_number(void)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel != 0),
               "Channel number not set yet!");
 
@@ -179,12 +179,6 @@ int MSG_process_killall(int reset_PIDs)
 MSG_error_t MSG_clean(void)
 {
 
-// Exit the LIB host_lib
-xbt_lib_free(&host_lib);
-xbt_lib_free(&link_lib);
-xbt_lib_free(&as_router_lib);
-
-
 #ifdef HAVE_TRACING
   TRACE_surf_release();
 #endif