From 2f62bae9e3bbdd80cd374aaf0b93890e937d5b3d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 8 May 2021 12:11:36 -0400 Subject: kernel: Eliminate variable shadowing Now that the large kernel refactor is merged, we can eliminate the remaining variable shadowing cases. --- src/core/hle/kernel/k_memory_region.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/k_memory_region.h') diff --git a/src/core/hle/kernel/k_memory_region.h b/src/core/hle/kernel/k_memory_region.h index a861c04ab..90ab8fd62 100644 --- a/src/core/hle/kernel/k_memory_region.h +++ b/src/core/hle/kernel/k_memory_region.h @@ -82,9 +82,9 @@ public: type_id = type; } - constexpr bool Contains(u64 address) const { + constexpr bool Contains(u64 addr) const { ASSERT(this->GetEndAddress() != 0); - return this->GetAddress() <= address && address <= this->GetLastAddress(); + return this->GetAddress() <= addr && addr <= this->GetLastAddress(); } constexpr bool IsDerivedFrom(u32 type) const { -- cgit v1.2.3