Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / examples / cpp / synchro-semaphore / s4u-synchro-semaphore.cpp

diff --git a/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
index d6da00517ba8abe84834e40fc129e91c1b2c9a4c..8f7e2536cd40af8bd5488921d3f17a3ed8a030e1 100644 (file)
--- a/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
+++ b/examples/cpp/synchro-semaphore/s4u-synchro-semaphore.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2022. 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,9 +16,9 @@ const char* buffer;                                                        /* Wh
 simgrid::s4u::SemaphorePtr sem_empty = simgrid::s4u::Semaphore::create(1); /* indicates whether the buffer is empty */
 simgrid::s4u::SemaphorePtr sem_full  = simgrid::s4u::Semaphore::create(0); /* indicates whether the buffer is full */
 
-static void producer(const std::vector<std::string>* args)
+static void producer(const std::vector<std::string>& args)
 {
-  for (auto const& str : *args) {
+  for (auto const& str : args) {
     sem_empty->acquire();
     XBT_INFO("Pushing '%s'", str.c_str());
     buffer = str.c_str();
@@ -45,8 +45,8 @@ int main(int argc, char **argv)
   std::vector<std::string> args({"one", "two", "three", ""});
   simgrid::s4u::Engine e(&argc, argv);
   e.load_platform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor::create("producer", simgrid::s4u::Host::by_name("Tremblay"), producer, &args);
-  simgrid::s4u::Actor::create("consumer", simgrid::s4u::Host::by_name("Jupiter"), consumer);
+  simgrid::s4u::Actor::create("producer", e.host_by_name("Tremblay"), producer, std::cref(args));
+  simgrid::s4u::Actor::create("consumer", e.host_by_name("Jupiter"), consumer);
   e.run();
 
   return 0;