Pointer-to-const for sonar.

[simgrid.git] / examples / s4u / mc-bugged2 / s4u-mc-bugged2.cpp

diff --git a/examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp b/examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp
index 66c085e..36196bb 100644 (file)
--- a/examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp
+++ b/examples/s4u/mc-bugged2/s4u-mc-bugged2.cpp
@@ -15,27 +15,27 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
 
 static void server()
 {
-  void* received1 = nullptr;
-  void* received2 = nullptr;
+  const int* received1 = nullptr;
+  const int* received2 = nullptr;
 
-  received1 = simgrid::s4u::Mailbox::by_name("mymailbox")->get();
-  long val1 = *(static_cast<int*>(received1));
+  received1 = simgrid::s4u::Mailbox::by_name("mymailbox")->get<int>();
+  long val1 = *received1;
   received1 = nullptr;
   XBT_INFO("Received %ld", val1);
 
-  received2 = simgrid::s4u::Mailbox::by_name("mymailbox")->get();
-  long val2 = *(static_cast<int*>(received2));
+  received2 = simgrid::s4u::Mailbox::by_name("mymailbox")->get<int>();
+  long val2 = *received2;
   received2 = nullptr;
   XBT_INFO("Received %ld", val2);
 
   MC_assert(std::min(val1, val2) == 1);
 
-  received1 = simgrid::s4u::Mailbox::by_name("mymailbox")->get();
-  val1      = *(static_cast<int*>(received1));
+  received1 = simgrid::s4u::Mailbox::by_name("mymailbox")->get<int>();
+  val1      = *received1;
   XBT_INFO("Received %ld", val1);
 
-  received2 = simgrid::s4u::Mailbox::by_name("mymailbox")->get();
-  val2      = *(static_cast<int*>(received2));
+  received2 = simgrid::s4u::Mailbox::by_name("mymailbox")->get<int>();
+  val2      = *received2;
   XBT_INFO("Received %ld", val2);
 
   XBT_INFO("OK");
@@ -43,10 +43,8 @@ static void server()
 
 static void client(int id)
 {
-  int* payload1 = new int();
-  *payload1     = id;
-  int* payload2 = new int();
-  *payload2     = id;
+  auto* payload1 = new int(id);
+  auto* payload2 = new int(id);
 
   XBT_INFO("Send %d", id);
   simgrid::s4u::Mailbox::by_name("mymailbox")->put(payload1, 10000);