For sonar, remove explicit new/delete.

[simgrid.git] / examples / s4u / replay-comm / s4u-replay-comm.cpp

diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp
index 1983bf0f420c4ae060549b59eb19027c57824deb..39e8ac6f87c662afc5c7a3f369583bf5c57de11b 100644 (file)
--- a/examples/s4u/replay-comm/s4u-replay-comm.cpp
+++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp
@@ -7,6 +7,7 @@
 #include "xbt/replay.hpp"
 #include "xbt/str.h"
 #include <boost/algorithm/string/join.hpp>
+#include <cinttypes>
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(replay_comm, "Messages specific for this msg example");
@@ -52,11 +53,11 @@ public:
 
   static void send(simgrid::xbt::ReplayAction& action)
   {
-    long size                 = static_cast<long>(std::stod(action[3]));
-    std::string* payload      = new std::string(action[3]);
+    auto size                 = static_cast<uint64_t>(std::stod(action[3]));
+    auto* payload             = new std::string(action[3]);
     double clock              = simgrid::s4u::Engine::get_clock();
     simgrid::s4u::Mailbox* to = simgrid::s4u::Mailbox::by_name(simgrid::s4u::this_actor::get_name() + "_" + action[2]);
-    ACT_DEBUG("Entering Send: %s (size: %ld) -- Actor %s on mailbox %s", NAME.c_str(), size,
+    ACT_DEBUG("Entering Send: %s (size: %" PRIu64 ") -- Actor %s on mailbox %s", NAME.c_str(), size,
               simgrid::s4u::this_actor::get_cname(), to->get_cname());
     to->put(payload, size);
     delete payload;
@@ -99,16 +100,15 @@ int main(int argc, char* argv[])
   xbt_replay_action_register("send", Replayer::send);
   xbt_replay_action_register("recv", Replayer::recv);
 
+  std::ifstream ifs;
   if (argv[3]) {
-    simgrid::xbt::action_fs = new std::ifstream(argv[3], std::ifstream::in);
+    ifs.open(argv[3], std::ifstream::in);
+    simgrid::xbt::action_fs = &ifs;
   }
 
   e.run();
 
-  if (argv[3]) {
-    delete simgrid::xbt::action_fs;
-    simgrid::xbt::action_fs = nullptr;
-  }
+  simgrid::xbt::action_fs = nullptr;
 
   XBT_INFO("Simulation time %g", e.get_clock());