Merge branch 'master' into async-wait

[simgrid.git] / examples / s4u / async-waitall / s4u-async-waitall.cpp

diff --git a/examples/s4u/async-waitall/s4u-async-waitall.cpp b/examples/s4u/async-waitall/s4u-async-waitall.cpp
index f93a699..55f645e 100644 (file)
--- a/examples/s4u/async-waitall/s4u-async-waitall.cpp
+++ b/examples/s4u/async-waitall/s4u-async-waitall.cpp
@@ -17,7 +17,7 @@
 #include <cstdlib>
 #include <iostream>
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this s4u example");
 
 class sender {
   long messages_count;
@@ -102,16 +102,15 @@ void operator()()
 
 int main(int argc, char *argv[])
 {
-  simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
-
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n", argv[0]);
 
-  e->registerFunction<sender>("sender");
-  e->registerFunction<receiver>("receiver");
+  simgrid::s4u::Engine e(&argc, argv);
+  e.registerFunction<sender>("sender");
+  e.registerFunction<receiver>("receiver");
 
-  e->loadPlatform(argv[1]);
-  e->loadDeployment(argv[2]); 
-  e->run();
+  e.loadPlatform(argv[1]);
+  e.loadDeployment(argv[2]);
+  e.run();
 
   return 0;
 }