Merge pull request #8199 from lioncash/namespace

General: Use nested namespace specifiers where applicable

2 files changed, 4 insertions, 10 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index a0e17da549..6b44466eb6 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -20,9 +20,7 @@
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Pipes/Pipes.h"
 
-namespace ciface
-{
-namespace Pipes
+namespace ciface::Pipes
 {
 static const std::array<std::string, 12> s_button_tokens{
     {"A", "B", "X", "Y", "Z", "START", "L", "R", "D_UP", "D_DOWN", "D_LEFT", "D_RIGHT"}};
@@ -161,5 +159,4 @@ void PipeDevice::ParseCommand(const std::string& command)
     }
   }
 }
-}  // namespace Pipes
-}  // namespace ciface
+}  // namespace ciface::Pipes
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
index 86202a20f4..3d316f64e4 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
@@ -8,9 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace ciface
-{
-namespace Pipes
+namespace ciface::Pipes
 {
 // To create a piped controller input, create a named pipe in the
 // Pipes directory and write commands out to it. Commands are separated
@@ -58,5 +56,4 @@ private:
   std::map<std::string, PipeInput*> m_buttons;
   std::map<std::string, PipeInput*> m_axes;
 };
-}  // namespace Pipes
-}  // namespace ciface
+}  // namespace ciface::Pipes