diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2020-08-01 00:17:23 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2020-08-08 21:45:03 +0100 |
| commit | d2b06f47867449f112b7a782cdb626ab0f175cee (patch) | |
| tree | a37a472d347193f7caa2b49023a44da5beed29c0 /Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp | |
| parent | a161e58591cadc504c9751a563f4c065ad0f435a (diff) | |
Fix various -Wshadow 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)) { } |
