summaryrefslogtreecommitdiff
path: root/src/core/frontend/emu_window.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2021-05-16 01:35:46 -0700
committerGravatar GitHub2021-05-16 01:35:46 -0700
commitad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch)
treea72d953f095188960382e115138d69d0667db6d9 /src/core/frontend/emu_window.cpp
parentMerge pull request #6307 from Morph1984/fix-response-push-size (diff)
parentcore: Make variable shadowing a compile-time error (diff)
downloadyuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.gz
yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.tar.xz
yuzu-ad6e20cfdee573cf2abc2b6ffc749726a56b3354.zip
Merge pull request #6296 from lioncash/shadow-error
core: Make variable shadowing a compile-time error
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
-rw-r--r--src/core/frontend/emu_window.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index cff49899a..e11ec0b0b 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -26,7 +26,7 @@ public:
26private: 26private:
27 class Device : public Input::TouchDevice { 27 class Device : public Input::TouchDevice {
28 public: 28 public:
29 explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {} 29 explicit Device(std::weak_ptr<TouchState>&& touch_state_) : touch_state(touch_state_) {}
30 Input::TouchStatus GetStatus() const override { 30 Input::TouchStatus GetStatus() const override {
31 if (auto state = touch_state.lock()) { 31 if (auto state = touch_state.lock()) {
32 std::lock_guard guard{state->mutex}; 32 std::lock_guard guard{state->mutex};