From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 15 Mar 2017 23:09:14 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_15~96
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/78735fcbb46edc128c9a77677283c6f20c3d9a65?hp=f50c785a8f726657dc3b4e32de522a7b3baca707

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

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.cpp b/examples/s4u/actions-comm/s4u_actions-comm.cpp
index 28d94f295c..e6699558a2 100644
--- a/examples/s4u/actions-comm/s4u_actions-comm.cpp
+++ b/examples/s4u/actions-comm/s4u_actions-comm.cpp
@@ -31,17 +31,20 @@ public:
   {
     int argc;
     char* argv[2];
-    argv[0] = (char*)(args.at(0).c_str());
+    argv[0] = &args.at(0)[0];
     if (args.size() == 1) {
       argc = 1;
     } else {
       argc    = 2;
-      argv[1] = (char*)(args.at(1).c_str());
+      argv[1] = &args.at(1)[0];
     }
     xbt_replay_action_runner(argc, argv);
   }
 
-  void operator()() {}
+  void operator()()
+  {
+    // Nothing to do here
+  }
 
   /* My actions */
   static void compute(const char* const* action)