From 9b955db701c4c435052342d0f1398386e5c67f59 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 15 Dec 2020 23:02:47 +0100 Subject: [PATCH] Cosmetics (and one less memleak). --- .../network-ns3-wifi/s4u-network-ns3-wifi.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp index be1342d7b6..f397ade6be 100644 --- a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp +++ b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp @@ -11,25 +11,25 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(ns3_wifi_example, "Messages specific for this s4u e class Message { - public: - std::string sender; - int size; +public: + std::string sender; + int size; - Message(std::string sender_, int size_) : sender(sender_), size(size_){} + Message(std::string sender_, int size_) : sender(sender_), size(size_) {} }; static void sender(std::string mailbox, double msg_size, unsigned sleep_time) { simgrid::s4u::this_actor::sleep_for(sleep_time); - simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mailbox); - Message* msg = new Message(simgrid::s4u::this_actor::get_host()->get_name(), msg_size); + auto* mbox = simgrid::s4u::Mailbox::by_name(mailbox); + auto* msg = new Message(simgrid::s4u::this_actor::get_host()->get_name(), msg_size); mbox->put(msg, msg_size); } static void receiver(std::string mailbox) { - simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mailbox); - Message* msg = (Message*) mbox->get(); + auto* mbox = simgrid::s4u::Mailbox::by_name(mailbox); + auto msg = std::unique_ptr(static_cast(mbox->get())); XBT_INFO("[%s] %s received %d bytes from %s", mailbox.c_str(), simgrid::s4u::this_actor::get_host()->get_name().c_str(), -- 2.20.1