From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 3 May 2019 12:23:19 +0000 (+0200)
Subject: [sonar] Rename shadowing local variables.
X-Git-Tag: v3.22.2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/043ae887210f9720621e83305f5fb434604f6b83?ds=sidebyside

[sonar] Rename shadowing local variables.
---

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 3b46bc1529..83178f8d8a 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -448,12 +448,12 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
 
     XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
     simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
-      simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
+      simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(
           arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
       if (arg->kill_time >= 0)
-        actor->set_kill_time(arg->kill_time);
+        new_actor->set_kill_time(arg->kill_time);
       if (auto_restart)
-        actor->set_auto_restart(auto_restart);
+        new_actor->set_auto_restart(auto_restart);
       delete arg;
     });
   } else {                      // start_time <= SIMIX_get_clock()
diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
index 5e8ddf5731..74cdbbed95 100644
--- a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
@@ -40,8 +40,8 @@ static void master()
 
   // Synchronize on a successful Future<void>:
   simgrid::simix::kernel_sync([] {
-    return kernel_wait_until(10).then([](simgrid::kernel::Future<void> future) {
-      future.get();
+    return kernel_wait_until(10).then([](simgrid::kernel::Future<void> f) {
+      f.get();
       XBT_INFO("kernel_sync with void");
     });
   });
@@ -50,8 +50,8 @@ static void master()
   // Synchronize on a failing Future<void>:
   try {
     simgrid::simix::kernel_sync([] {
-      return kernel_wait_until(20).then([](simgrid::kernel::Future<void> future) {
-        future.get();
+      return kernel_wait_until(20).then([](simgrid::kernel::Future<void> f) {
+        f.get();
         throw example::exception("Exception throwed from kernel_defer");
       });
     });
@@ -62,8 +62,8 @@ static void master()
 
   // Synchronize on a successul Future<int> and get the value:
   int res = simgrid::simix::kernel_sync([] {
-    return kernel_wait_until(30).then([](simgrid::kernel::Future<void> future) {
-      future.get();
+    return kernel_wait_until(30).then([](simgrid::kernel::Future<void> f) {
+      f.get();
       XBT_INFO("kernel_sync with value");
       return 42;
     });
@@ -72,8 +72,8 @@ static void master()
 
   // Synchronize on a successul Future<int> and get the value:
   simgrid::simix::Future<int> future = simgrid::simix::kernel_async([] {
-    return kernel_wait_until(50).then([](simgrid::kernel::Future<void> future) {
-      future.get();
+    return kernel_wait_until(50).then([](simgrid::kernel::Future<void> f) {
+      f.get();
       XBT_INFO("kernel_async with value");
       return 43;
     });
@@ -83,8 +83,8 @@ static void master()
 
   // Synchronize on a successul Future<int> and get the value:
   future = simgrid::simix::kernel_async([] {
-    return kernel_wait_until(60).then([](simgrid::kernel::Future<void> future) {
-      future.get();
+    return kernel_wait_until(60).then([](simgrid::kernel::Future<void> f) {
+      f.get();
       XBT_INFO("kernel_async with value");
       return 43;
     });