Merge with master and fix conflicts

[simgrid.git] / examples / msg / token_ring / token_bypass.c

diff --git a/examples/msg/token_ring/token_bypass.c b/examples/msg/token_ring/token_bypass.c
index 9e1c14b..a5690e7 100644 (file)
--- a/examples/msg/token_ring/token_bypass.c
+++ b/examples/msg/token_ring/token_bypass.c
@@ -62,7 +62,10 @@ int host(int argc, char *argv[])
 static int surf_parse_bypass_platform(void)
 {
   sg_platf_begin();
-  sg_platf_new_AS_begin("AS0", A_surfxml_AS_routing_Full);
+  s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+  AS.id = "AS0";
+  AS.routing = A_surfxml_AS_routing_Full;
+  sg_platf_new_AS_begin(&AS);
 
   s_sg_platf_host_cbarg_t bob = SG_PLATF_HOST_INITIALIZER;
   bob.id = "bob";
@@ -118,7 +121,7 @@ int main(int argc, char **argv)
 
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  MSG_clean();
+
   if (res == MSG_OK)
     return 0;
   else