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/memory/cheat_engine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/memory/cheat_engine.cpp') diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 8eec567ab..7643b7846 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -222,8 +222,8 @@ void CheatEngine::SetMainMemoryParameters(VAddr main_region_begin, u64 main_regi }; } -void CheatEngine::Reload(std::vector cheats) { - this->cheats = std::move(cheats); +void CheatEngine::Reload(std::vector reload_cheats) { + cheats = std::move(reload_cheats); is_pending_reload.exchange(true); } -- cgit v1.2.3