diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-16 01:35:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-16 01:35:46 -0700 |
commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/frontend | |
parent | e8d2de1f99a73d6e92ab91d448e47e087833f7f7 (diff) | |
parent | 9a07ed53ebe4e27ef1a14e0469037cab9fb7b1e7 (diff) |
Merge pull request #6296 from lioncash/shadow-error
core: Make variable shadowing a compile-time error
Diffstat (limited to 'src/core/frontend')
-rw-r--r-- | src/core/frontend/emu_window.cpp | 2 |
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: private: class Device : public Input::TouchDevice { public: - explicit Device(std::weak_ptr<TouchState>&& touch_state) : touch_state(touch_state) {} + explicit Device(std::weak_ptr<TouchState>&& touch_state_) : touch_state(touch_state_) {} Input::TouchStatus GetStatus() const override { if (auto state = touch_state.lock()) { std::lock_guard guard{state->mutex}; |