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/tools/freezer.cpp | 4 ++-- src/core/tools/freezer.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/tools') diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 5c674a099..2e09faa6d 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -67,8 +67,8 @@ Freezer::~Freezer() { core_timing.UnscheduleEvent(event, 0); } -void Freezer::SetActive(bool active) { - if (!this->active.exchange(active)) { +void Freezer::SetActive(bool is_active) { + if (!active.exchange(is_active)) { FillEntryReads(); core_timing.ScheduleEvent(memory_freezer_ns, event); LOG_DEBUG(Common_Memory, "Memory freezer activated!"); diff --git a/src/core/tools/freezer.h b/src/core/tools/freezer.h index 0fdb701a7..067134e93 100644 --- a/src/core/tools/freezer.h +++ b/src/core/tools/freezer.h @@ -43,7 +43,7 @@ public: ~Freezer(); // Enables or disables the entire memory freezer. - void SetActive(bool active); + void SetActive(bool is_active); // Returns whether or not the freezer is active. bool IsActive() const; -- cgit v1.2.3