diff options
| author | Léo Lam <leo@leolam.fr> | 2020-08-17 14:49:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 14:49:28 +0200 |
| commit | 55c931d6248c6dda5a8a9cbd332131255d62bc3f (patch) | |
| tree | 9ea6e7205a2e37c587b44432749fb0a5cd438f2b /Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | |
| parent | 6104018fe13eeb02dfd26f02fb42d74e77e39f16 (diff) | |
| parent | ca61b6c1ab7966cb7f3509c81439e5c673f5ae88 (diff) | |
Merge pull request #8995 from Tilka/warnings
Fix some more GCC warnings
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp index 4a03527ffe..a0157eec8f 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp @@ -56,14 +56,14 @@ ControlState AnalogStick::GetGateRadiusAtAngle(double ang) const return m_stick_gate->GetRadiusAtAngle(ang); } -OctagonAnalogStick::OctagonAnalogStick(const char* name, ControlState gate_radius) - : OctagonAnalogStick(name, name, gate_radius) +OctagonAnalogStick::OctagonAnalogStick(const char* name_, ControlState gate_radius) + : OctagonAnalogStick(name_, name_, gate_radius) { } -OctagonAnalogStick::OctagonAnalogStick(const char* name, const char* ui_name, +OctagonAnalogStick::OctagonAnalogStick(const char* name_, const char* ui_name_, ControlState gate_radius) - : AnalogStick(name, ui_name, std::make_unique<ControllerEmu::OctagonStickGate>(gate_radius)) + : AnalogStick(name_, ui_name_, std::make_unique<ControllerEmu::OctagonStickGate>(gate_radius)) { } |
