Merge pull request #8199 from lioncash/namespace

General: Use nested namespace specifiers where applicable

2 files changed, 5 insertions, 10 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 9ab4cbf0f8..910b7553c9 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -8,9 +8,7 @@
 #include <thread>
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
-namespace ciface
-{
-namespace Android
+namespace ciface::Android
 {
 void PopulateDevices()
 {
@@ -240,5 +238,4 @@ void Touchscreen::Motor::Rumble(int padID, double state)
   JNIEnv* env = IDCache::GetEnvForThread();
   env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetDoRumble(), padID, state);
 }
-}  // namespace Android
-}  // namespace ciface
+}  // namespace ciface::Android
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index b917222864..82a1a47954 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -7,11 +7,10 @@
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "jni/ButtonManager.h"
 
-namespace ciface
-{
-namespace Android
+namespace ciface::Android
 {
 void PopulateDevices();
+
 class Touchscreen : public Core::Device
 {
 private:
@@ -65,5 +64,4 @@ public:
 private:
   const int _padID;
 };
-}  // namespace Android
-}  // namespace ciface
+}  // namespace ciface::Android