Shadowed variables (Sonar).

diff --git a/src/mc/explo/odpor/Execution.cpp b/src/mc/explo/odpor/Execution.cpp
index 5c9d72b..162425d 100644 (file)
--- a/src/mc/explo/odpor/Execution.cpp
+++ b/src/mc/explo/odpor/Execution.cpp
@@ -287,8 +287,8 @@ std::optional<PartialExecution> Execution::get_odpor_extension_from(EventHandle
       if (disqualified_actors.count(q) > 0) { // Did we already note that `q` is not an initial?
         continue;
       }
-      const bool is_initial = std::none_of(v_handles.begin(), v_handles.end(), [&](const auto& e_star) {
-        return E_prime_v.happens_before(e_star, e_star_in_E_prime_v);
+      const bool is_initial = std::none_of(v_handles.begin(), v_handles.end(), [&](const auto& handle) {
+        return E_prime_v.happens_before(handle, e_star_in_E_prime_v);
       });
       if (is_initial) {
         // If the sleep set already contains `q`, we're done:
@@ -320,8 +320,8 @@ std::optional<PartialExecution> Execution::get_odpor_extension_from(EventHandle
   const EventHandle e_prime_in_E_prime_v = E_prime_v.get_latest_event_handle().value();
   v_handles.push_back(e_prime_in_E_prime_v);
 
-  const bool is_initial = std::none_of(v_handles.begin(), v_handles.end(), [&](const auto& e_star) {
-    return E_prime_v.happens_before(e_star, e_prime_in_E_prime_v);
+  const bool is_initial = std::none_of(v_handles.begin(), v_handles.end(), [&](const auto& handle) {
+    return E_prime_v.happens_before(handle, e_prime_in_E_prime_v);
   });
   if (is_initial) {
     if (const aid_t q = E_prime_v.get_actor_with_handle(e_prime_in_E_prime_v); sleep_E_prime.count(q) > 0) {

diff --git a/src/mc/explo/udpor/ExtensionSetCalculator.cpp b/src/mc/explo/udpor/ExtensionSetCalculator.cpp
index 11c9ae8..e928105 100644 (file)
--- a/src/mc/explo/udpor/ExtensionSetCalculator.cpp
+++ b/src/mc/explo/udpor/ExtensionSetCalculator.cpp
@@ -265,14 +265,15 @@ EventSet ExtensionSetCalculator::partially_extend_CommWait(const Configuration&
       }
 
       // What send # is the issuer
-      const unsigned send_position = std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto e) {
-        const auto* e_send = dynamic_cast<const CommSendTransition*>(e->get_transition());
-        return e_send && e_send->get_mailbox() == issuer_mailbox;
-      });
+      const unsigned send_position =
+          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto ev) {
+            const auto* e_send = dynamic_cast<const CommSendTransition*>(ev->get_transition());
+            return e_send && e_send->get_mailbox() == issuer_mailbox;
+          });
 
       // What receive # is the event `e`?
-      const unsigned receive_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto e) {
-        const auto* e_receive = dynamic_cast<const CommRecvTransition*>(e->get_transition());
+      const unsigned receive_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto ev) {
+        const auto* e_receive = dynamic_cast<const CommRecvTransition*>(ev->get_transition());
         return e_receive && e_receive->get_mailbox() == issuer_mailbox;
       });
 
@@ -308,15 +309,15 @@ EventSet ExtensionSetCalculator::partially_extend_CommWait(const Configuration&
       }
 
       // What receive # is the event `e`?
-      const unsigned send_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto e) {
-        const auto* e_send = dynamic_cast<const CommSendTransition*>(e->get_transition());
+      const unsigned send_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto ev) {
+        const auto* e_send = dynamic_cast<const CommSendTransition*>(ev->get_transition());
         return e_send && e_send->get_mailbox() == issuer_mailbox;
       });
 
       // What send # is the issuer
       const unsigned receive_position =
-          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto e) {
-            const auto* e_receive = dynamic_cast<const CommRecvTransition*>(e->get_transition());
+          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto ev) {
+            const auto* e_receive = dynamic_cast<const CommRecvTransition*>(ev->get_transition());
             return e_receive && e_receive->get_mailbox() == issuer_mailbox;
           });
 
@@ -406,14 +407,15 @@ EventSet ExtensionSetCalculator::partially_extend_CommTest(const Configuration&
       }
 
       // What send # is the issuer
-      const unsigned send_position = std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto e) {
-        const auto* e_send = dynamic_cast<const CommSendTransition*>(e->get_transition());
-        return e_send && e_send->get_mailbox() == issuer_mailbox;
-      });
+      const unsigned send_position =
+          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto ev) {
+            const auto* e_send = dynamic_cast<const CommSendTransition*>(ev->get_transition());
+            return e_send && e_send->get_mailbox() == issuer_mailbox;
+          });
 
       // What receive # is the event `e`?
-      const unsigned receive_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto e) {
-        const auto* e_receive = dynamic_cast<const CommRecvTransition*>(e->get_transition());
+      const unsigned receive_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto ev) {
+        const auto* e_receive = dynamic_cast<const CommRecvTransition*>(ev->get_transition());
         return e_receive && e_receive->get_mailbox() == issuer_mailbox;
       });
 
@@ -449,15 +451,15 @@ EventSet ExtensionSetCalculator::partially_extend_CommTest(const Configuration&
       }
 
       // What receive # is the event `e`?
-      const unsigned send_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto e) {
-        const auto* e_send = dynamic_cast<const CommSendTransition*>(e->get_transition());
+      const unsigned send_position = std::count_if(config_K.begin(), config_K.end(), [=](const auto ev) {
+        const auto* e_send = dynamic_cast<const CommSendTransition*>(ev->get_transition());
         return e_send && e_send->get_mailbox() == issuer_mailbox;
       });
 
       // What send # is the issuer
       const unsigned receive_position =
-          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto e) {
-            const auto* e_receive = dynamic_cast<const CommRecvTransition*>(e->get_transition());
+          std::count_if(e_issuer_history.begin(), e_issuer_history.end(), [=](const auto ev) {
+            const auto* e_receive = dynamic_cast<const CommRecvTransition*>(ev->get_transition());
             return e_receive && e_receive->get_mailbox() == issuer_mailbox;
           });
 

diff --git a/src/xbt/utils/iter/subsets.hpp b/src/xbt/utils/iter/subsets.hpp
index f948b38..ec3cac8 100644 (file)
--- a/src/xbt/utils/iter/subsets.hpp
+++ b/src/xbt/utils/iter/subsets.hpp
@@ -103,14 +103,13 @@ template <typename Iterator> void subsets_iterator<Iterator>::increment()
   ++current_subset[k - 1];
   ++P[k - 1];
 
-  const auto end                  = this->end.value();
-  const bool shift_other_elements = current_subset[k - 1] == end;
+  const bool shift_other_elements = current_subset[k - 1] == end.value();
 
   if (shift_other_elements) {
     if (k == 1) {
       // We're done in the case that k = 1; here, we've iterated
       // through the list once, which is all that is needed
-      this->end = std::nullopt;
+      end = std::nullopt;
       return;
     }
 
@@ -150,7 +149,7 @@ template <typename Iterator> void subsets_iterator<Iterator>::increment()
     // element can be located. Thus, if `P[0] > (n - k)`, this means
     // we've sucessfully iterated through all subsets so we're done
     if (P[0] > (n - k)) {
-      this->end = std::nullopt;
+      end = std::nullopt;
       return;
     }