From ccca5e7c2872d477cc7bef73ed141dc093b106ef Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 19 Apr 2018 21:41:44 -0400
Subject: service: Use nested namespace specifiers where applicable

Tidies up namespace declarations
---
 src/core/hle/service/spl/csrng.cpp  | 6 ++----
 src/core/hle/service/spl/csrng.h    | 6 ++----
 src/core/hle/service/spl/module.cpp | 6 ++----
 src/core/hle/service/spl/module.h   | 6 ++----
 src/core/hle/service/spl/spl.cpp    | 6 ++----
 src/core/hle/service/spl/spl.h      | 6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'src/core/hle/service/spl')

diff --git a/src/core/hle/service/spl/csrng.cpp b/src/core/hle/service/spl/csrng.cpp
index cde05717a..b9e6b799d 100644
--- a/src/core/hle/service/spl/csrng.cpp
+++ b/src/core/hle/service/spl/csrng.cpp
@@ -4,8 +4,7 @@
 
 #include "core/hle/service/spl/csrng.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 CSRNG::CSRNG(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "csrng") {
     static const FunctionInfo functions[] = {
@@ -14,5 +13,4 @@ CSRNG::CSRNG(std::shared_ptr<Module> module) : Module::Interface(std::move(modul
     RegisterHandlers(functions);
 }
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
diff --git a/src/core/hle/service/spl/csrng.h b/src/core/hle/service/spl/csrng.h
index 59ca794dd..3f849b5a7 100644
--- a/src/core/hle/service/spl/csrng.h
+++ b/src/core/hle/service/spl/csrng.h
@@ -6,13 +6,11 @@
 
 #include "core/hle/service/spl/module.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 class CSRNG final : public Module::Interface {
 public:
     explicit CSRNG(std::shared_ptr<Module> module);
 };
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
diff --git a/src/core/hle/service/spl/module.cpp b/src/core/hle/service/spl/module.cpp
index fc1bcd94c..3f5a342a7 100644
--- a/src/core/hle/service/spl/module.cpp
+++ b/src/core/hle/service/spl/module.cpp
@@ -11,8 +11,7 @@
 #include "core/hle/service/spl/module.h"
 #include "core/hle/service/spl/spl.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 Module::Interface::Interface(std::shared_ptr<Module> module, const char* name)
     : ServiceFramework(name), module(std::move(module)) {}
@@ -38,5 +37,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<SPL>(module)->InstallAsService(service_manager);
 }
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
diff --git a/src/core/hle/service/spl/module.h b/src/core/hle/service/spl/module.h
index 12cdb2980..6ab91b400 100644
--- a/src/core/hle/service/spl/module.h
+++ b/src/core/hle/service/spl/module.h
@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 class Module final {
 public:
@@ -25,5 +24,4 @@ public:
 /// Registers all SPL services with the specified service manager.
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
diff --git a/src/core/hle/service/spl/spl.cpp b/src/core/hle/service/spl/spl.cpp
index 3fcef341e..bb1e03342 100644
--- a/src/core/hle/service/spl/spl.cpp
+++ b/src/core/hle/service/spl/spl.cpp
@@ -4,8 +4,7 @@
 
 #include "core/hle/service/spl/spl.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 SPL::SPL(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "spl:") {
     static const FunctionInfo functions[] = {
@@ -43,5 +42,4 @@ SPL::SPL(std::shared_ptr<Module> module) : Module::Interface(std::move(module),
     RegisterHandlers(functions);
 }
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
diff --git a/src/core/hle/service/spl/spl.h b/src/core/hle/service/spl/spl.h
index 9fd6059af..69c4c1747 100644
--- a/src/core/hle/service/spl/spl.h
+++ b/src/core/hle/service/spl/spl.h
@@ -6,13 +6,11 @@
 
 #include "core/hle/service/spl/module.h"
 
-namespace Service {
-namespace SPL {
+namespace Service::SPL {
 
 class SPL final : public Module::Interface {
 public:
     explicit SPL(std::shared_ptr<Module> module);
 };
 
-} // namespace SPL
-} // namespace Service
+} // namespace Service::SPL
-- 
cgit v1.2.3