From 84be3f75362940d156a2fc815a6ba8411777714f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 24 Nov 2020 10:16:11 +0100 Subject: [PATCH] For sonar, remove explicit new/delete. --- examples/s4u/replay-comm/s4u-replay-comm.cpp | 9 ++++----- examples/s4u/replay-io/s4u-replay-io.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/examples/s4u/replay-comm/s4u-replay-comm.cpp b/examples/s4u/replay-comm/s4u-replay-comm.cpp index 5d3a4305e9..39e8ac6f87 100644 --- a/examples/s4u/replay-comm/s4u-replay-comm.cpp +++ b/examples/s4u/replay-comm/s4u-replay-comm.cpp @@ -100,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()); diff --git a/examples/s4u/replay-io/s4u-replay-io.cpp b/examples/s4u/replay-io/s4u-replay-io.cpp index 9b752dcc02..335d4311e2 100644 --- a/examples/s4u/replay-io/s4u-replay-io.cpp +++ b/examples/s4u/replay-io/s4u-replay-io.cpp @@ -114,16 +114,15 @@ int main(int argc, char* argv[]) xbt_replay_action_register("read", Replayer::read); xbt_replay_action_register("close", Replayer::close); + 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()); -- 2.20.1