diff options
| author | Scott Mansell <phiren@gmail.com> | 2023-02-10 21:21:15 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 21:21:15 +1300 |
| commit | dad7a32a35d0d28946c16e740692d014a858d2ea (patch) | |
| tree | 1422619a72cdcdf51e1d1e60509859f664d2d762 /Source/Core/InputCommon/ControllerInterface | |
| parent | a88e5ef3907e79ed20ab67e4df45c36e6ab2b909 (diff) | |
| parent | 3024ca2146cfdae2e7fb231e8d180dfc81e1a74e (diff) | |
Merge pull request #11534 from Pokechu22/warning-fixes-feb-2023
Resolve various compiler warnings
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index c0594b6662..36371fd368 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -151,9 +151,9 @@ void KeyboardMouse::SelectEventsForDevice(XIEventMask* mask, int deviceid) } KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard, - double scroll_increment) + double scroll_increment_) : m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(keyboard), - scroll_increment(scroll_increment) + scroll_increment(scroll_increment_) { // The cool thing about each KeyboardMouse object having its own Display // is that each one gets its own separate copy of the X11 event stream, |