diff options
| author | 2021-05-16 01:35:46 -0700 | |
|---|---|---|
| committer | 2021-05-16 01:35:46 -0700 | |
| commit | ad6e20cfdee573cf2abc2b6ffc749726a56b3354 (patch) | |
| tree | a72d953f095188960382e115138d69d0667db6d9 /src/core/frontend/emu_window.cpp | |
| parent | Merge pull request #6307 from Morph1984/fix-response-push-size (diff) | |
| parent | core: Make variable shadowing a compile-time error (diff) | |
| download | yuzu-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.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: | |||
| 26 | private: | 26 | private: |
| 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}; |