Rework the OO design of S4U comms

[simgrid.git] / teshsuite / s4u / storage_client_server / storage_client_server.cpp

diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
index 0dcfafd4cf99047cb3da4802451c9109d6645b56..1592629176ae1528742b249dd241815a970c3db2 100644 (file)
--- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp
+++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015, 2017. The    SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -57,7 +56,7 @@ static void hsm_put(const char* remote_host, const char* src, const char* dest)
   XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::name().c_str(), read_size, remote_host);
   char* payload                    = bprintf("%s %llu", dest, read_size);
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(remote_host);
-  simgrid::s4u::this_actor::send(mailbox, payload, static_cast<double>(read_size));
+  mailbox->send(payload, static_cast<double>(read_size));
   simgrid::s4u::this_actor::sleep_for(.4);
 }
 
@@ -131,7 +130,7 @@ static void client()
   hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "c:\\Windows\\tata.c");
 
   simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("alice");
-  simgrid::s4u::this_actor::send(mailbox, xbt_strdup("finalize"), 0);
+  mailbox->send(xbt_strdup("finalize"), 0);
 
   get_set_storage_data("Disk1");
 }
@@ -173,5 +172,6 @@ int main(int argc, char* argv[])
 
   XBT_INFO("Simulated time: %g", e->getClock());
 
+  delete e;
   return 0;
 }