From a14ddc37d5bc4e36ef9161ee079733ee198cc43a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 2 Feb 2022 12:21:13 +0100 Subject: [PATCH] Reduce scope for variables. --- src/kernel/activity/ActivityImpl.cpp | 3 +-- src/kernel/actor/SimcallObserver.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index 22402f0ac7..2e1de24f10 100644 --- a/src/kernel/activity/ActivityImpl.cpp +++ b/src/kernel/activity/ActivityImpl.cpp @@ -111,8 +111,7 @@ void ActivityImpl::wait_for(actor::ActorImpl* issuer, double timeout) } else { /* we need a sleep action (even when the timeout is infinite) to be notified of host failures */ /* Comms handle that a bit differently of the other activities */ - auto* comm = dynamic_cast(this); - if (comm != nullptr) { + if (auto* comm = dynamic_cast(this)) { resource::Action* sleep = issuer->get_host()->get_cpu()->sleep(timeout); sleep->set_activity(comm); diff --git a/src/kernel/actor/SimcallObserver.cpp b/src/kernel/actor/SimcallObserver.cpp index d0dfbd6546..a2df655c76 100644 --- a/src/kernel/actor/SimcallObserver.cpp +++ b/src/kernel/actor/SimcallObserver.cpp @@ -240,8 +240,7 @@ bool ActivityTestSimcall::depends(SimcallObserver* other) std::string ActivityTestSimcall::to_string(int times_considered) const { std::string res = SimcallObserver::to_string(times_considered) + "Test "; - auto* comm = dynamic_cast(activity_); - if (comm) { + if (const auto* comm = dynamic_cast(activity_)) { if (comm->src_actor_.get() == nullptr || comm->dst_actor_.get() == nullptr) { res += "FALSE(comm="; res += XBT_LOG_ISENABLED(mc_observer, xbt_log_priority_verbose) ? xbt::string_printf("%p)", comm) -- 2.20.1