Use Mailbox::get_unique<>(), and save a few delete.

[simgrid.git] / examples / s4u / actor-create / s4u-actor-create.cpp

diff --git a/examples/s4u/actor-create/s4u-actor-create.cpp b/examples/s4u/actor-create/s4u-actor-create.cpp
index bff3790..d58ed94 100644 (file)
--- a/examples/s4u/actor-create/s4u-actor-create.cpp
+++ b/examples/s4u/actor-create/s4u-actor-create.cpp
@@ -33,13 +33,10 @@ static void receiver(const std::string& mailbox_name)
 
   XBT_INFO("Hello s4u, I'm ready to get any message you'd want on %s", mailbox->get_cname());
 
-  const std::string* msg1 = static_cast<std::string*>(mailbox->get());
-  const std::string* msg2 = static_cast<std::string*>(mailbox->get());
-  const std::string* msg3 = static_cast<std::string*>(mailbox->get());
+  auto msg1 = mailbox->get_unique<std::string>();
+  auto msg2 = mailbox->get_unique<std::string>();
+  auto msg3 = mailbox->get_unique<std::string>();
   XBT_INFO("I received '%s', '%s' and '%s'", msg1->c_str(), msg2->c_str(), msg3->c_str());
-  delete msg1;
-  delete msg2;
-  delete msg3;
   XBT_INFO("I'm done. See you.");
 }
 
@@ -49,7 +46,7 @@ static void forwarder(int argc, char** argv)
   xbt_assert(argc >= 3, "Actor forwarder requires 2 parameters, but got only %d", argc - 1);
   simgrid::s4u::Mailbox* in    = simgrid::s4u::Mailbox::by_name(argv[1]);
   simgrid::s4u::Mailbox* out   = simgrid::s4u::Mailbox::by_name(argv[2]);
-  std::string* msg             = static_cast<std::string*>(in->get());
+  auto* msg                    = in->get<std::string>();
   XBT_INFO("Forward '%s'.", msg->c_str());
   out->put(msg, msg->size());
 }
@@ -75,7 +72,7 @@ public:
     msg  = args[1];
     mbox = args[2];
   }
-  void operator()() /* This is the main code of the actor */
+  void operator()() const /* This is the main code of the actor */
   {
     XBT_INFO("Hello s4u, I have something to send");
     simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(mbox);