diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-06-18 11:33:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 11:33:08 +0200 |
| commit | ff96dc0e6ffd250b23ccb5ebceb12623da604435 (patch) | |
| tree | 1a1279d6bff0945ae575c195ec357af239896d8f /Source/Core/InputCommon/ControllerInterface/XInput | |
| parent | ac562279c3a9fe9cc660b703ed0fd3f8ab2be758 (diff) | |
| parent | 72b04a353ddfa79ec10fe447bef8eeaefc824976 (diff) | |
Merge pull request #8199 from lioncash/namespace
General: Use nested namespace specifiers where applicable
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.h | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index d6ecdb9d81..cda20a08db 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -8,9 +8,7 @@ #define XINPUT_GAMEPAD_GUIDE 0x0400 #endif -namespace ciface -{ -namespace XInput +namespace ciface::XInput { static const struct { @@ -243,5 +241,4 @@ void Device::Motor::SetState(ControlState state) m_motor = (WORD)(state * m_range); m_parent->UpdateMotors(); } -} // namespace XInput -} // namespace ciface +} // namespace ciface::XInput diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index 0b299e6324..3c543fb18f 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -18,9 +18,7 @@ #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong. #endif -namespace ciface -{ -namespace XInput +namespace ciface::XInput { void Init(); void PopulateDevices(); @@ -105,5 +103,4 @@ private: const BYTE m_subtype; const u8 m_index; }; -} // namespace XInput -} // namespace ciface +} // namespace ciface::XInput |