From ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 2 May 2021 22:14:15 -0400 Subject: core: Resolve misc cases of variable shadowing Resolves shadowing warnings that aren't in a particularly large subsection of core. Brings us closer to turning -Wshadow into an error. All that remains now is for cases in the kernel (left untouched for now since a big change by bunnei is pending), and a few left over in the service code (will be tackled next). --- src/core/core_timing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/core_timing.cpp') diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 874b5673a..c2f0f609f 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -133,8 +133,8 @@ void CoreTiming::UnscheduleEvent(const std::shared_ptr& event_type, } } -void CoreTiming::AddTicks(u64 ticks) { - this->ticks += ticks; +void CoreTiming::AddTicks(u64 ticks_to_add) { + ticks += ticks_to_add; downcount -= static_cast(ticks); } -- cgit v1.2.3