summaryrefslogtreecommitdiff
path: root/src/core/tools/freezer.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2021-05-02 22:14:15 -0400
committerGravatar Lioncash2021-05-03 01:19:13 -0400
commitebb64d5bf4c6a1b3e89e7addbd72ca310be7807b (patch)
tree024cebd87e461cc8212810576b0e759321911f1f /src/core/tools/freezer.cpp
parentMerge pull request #6269 from lioncash/file-shadow (diff)
downloadyuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.gz
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.xz
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.zip
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).
Diffstat (limited to 'src/core/tools/freezer.cpp')
-rw-r--r--src/core/tools/freezer.cpp4
1 files changed, 2 insertions, 2 deletions
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() {
67 core_timing.UnscheduleEvent(event, 0); 67 core_timing.UnscheduleEvent(event, 0);
68} 68}
69 69
70void Freezer::SetActive(bool active) { 70void Freezer::SetActive(bool is_active) {
71 if (!this->active.exchange(active)) { 71 if (!active.exchange(is_active)) {
72 FillEntryReads(); 72 FillEntryReads();
73 core_timing.ScheduleEvent(memory_freezer_ns, event); 73 core_timing.ScheduleEvent(memory_freezer_ns, event);
74 LOG_DEBUG(Common_Memory, "Memory freezer activated!"); 74 LOG_DEBUG(Common_Memory, "Memory freezer activated!");