X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..bd031688c75b0120d21a705ae3ee325ca0718530:/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp diff --git a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp index 91d68f6589..8c21ecc80f 100644 --- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp +++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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. */ @@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example"); -static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv) +XBT_ATTRIB_NORETURN static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv) { std::fprintf(stderr, "Usage: %s examples/platforms/cluster_backbone.xml \n" "where spec is a list of letters giving the kind of tests you want to see.\n" @@ -49,7 +49,7 @@ static void sender(std::vector args) for (unsigned int test = 1; test <= args[0].size(); test++) { simgrid::s4u::this_actor::sleep_until(test * 5 - 5); std::string* mboxName = new std::string("Test #" + std::to_string(test)); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName->c_str()); + simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(*mboxName); switch (args[0][test - 1]) { case 'r': @@ -96,7 +96,7 @@ static void receiver(std::vector args) for (unsigned int test = 1; test <= args[0].size(); test++) { simgrid::s4u::this_actor::sleep_until(test * 5 - 5); std::string mboxName = "Test #" + std::to_string(test); - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(mboxName.c_str()); + simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name(mboxName); void* received = nullptr; switch (args[0][test - 1]) {