From debed35c10ed94811107bdeb6f22177de6bdd86c Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Thu, 2 Feb 2023 16:07:30 -0800 Subject: [PATCH] State: Fix shadowing warnings --- Source/Core/Core/State.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index bbe80370f0..be39736790 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -473,7 +473,7 @@ void SaveAs(const std::string& filename, bool wait) Core::RunOnCPUThread( [&] { { - std::lock_guard lk(s_state_writes_in_queue_mutex); + std::lock_guard lk_(s_state_writes_in_queue_mutex); ++s_state_writes_in_queue; } @@ -515,7 +515,7 @@ void SaveAs(const std::string& filename, bool wait) // someone aborted the save by changing the mode? { // Note: The worker thread takes care of this in the other branch. - std::lock_guard lk(s_state_writes_in_queue_mutex); + std::lock_guard lk_(s_state_writes_in_queue_mutex); if (--s_state_writes_in_queue == 0) s_state_write_queue_is_empty.notify_all(); }