diff options
| author | 2018-04-19 21:41:44 -0400 | |
|---|---|---|
| committer | 2018-04-19 22:20:28 -0400 | |
| commit | ccca5e7c2872d477cc7bef73ed141dc093b106ef (patch) | |
| tree | 17f5db413993ed4a6f1fec0ac27fb20b44328459 /src/core/hle/service/fatal | |
| parent | Merge pull request #356 from lioncash/shader (diff) | |
| download | yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.gz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.xz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.zip | |
service: Use nested namespace specifiers where applicable
Tidies up namespace declarations
Diffstat (limited to 'src/core/hle/service/fatal')
| -rw-r--r-- | src/core/hle/service/fatal/fatal.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fatal/fatal.h | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fatal/fatal_p.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fatal/fatal_p.h | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fatal/fatal_u.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/fatal/fatal_u.h | 6 |
6 files changed, 12 insertions, 24 deletions
diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 1a18e0051..41d58f999 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp | |||
| @@ -8,8 +8,7 @@ | |||
| 8 | #include "core/hle/service/fatal/fatal_p.h" | 8 | #include "core/hle/service/fatal/fatal_p.h" |
| 9 | #include "core/hle/service/fatal/fatal_u.h" | 9 | #include "core/hle/service/fatal/fatal_u.h" |
| 10 | 10 | ||
| 11 | namespace Service { | 11 | namespace Service::Fatal { |
| 12 | namespace Fatal { | ||
| 13 | 12 | ||
| 14 | Module::Interface::Interface(std::shared_ptr<Module> module, const char* name) | 13 | Module::Interface::Interface(std::shared_ptr<Module> module, const char* name) |
| 15 | : ServiceFramework(name), module(std::move(module)) {} | 14 | : ServiceFramework(name), module(std::move(module)) {} |
| @@ -34,5 +33,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { | |||
| 34 | std::make_shared<Fatal_U>(module)->InstallAsService(service_manager); | 33 | std::make_shared<Fatal_U>(module)->InstallAsService(service_manager); |
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | } // namespace Fatal | 36 | } // namespace Service::Fatal |
| 38 | } // namespace Service | ||
diff --git a/src/core/hle/service/fatal/fatal.h b/src/core/hle/service/fatal/fatal.h index 85272b4be..2d8d08320 100644 --- a/src/core/hle/service/fatal/fatal.h +++ b/src/core/hle/service/fatal/fatal.h | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/hle/service/service.h" | 7 | #include "core/hle/service/service.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::Fatal { |
| 10 | namespace Fatal { | ||
| 11 | 10 | ||
| 12 | class Module final { | 11 | class Module final { |
| 13 | public: | 12 | public: |
| @@ -25,5 +24,4 @@ public: | |||
| 25 | 24 | ||
| 26 | void InstallInterfaces(SM::ServiceManager& service_manager); | 25 | void InstallInterfaces(SM::ServiceManager& service_manager); |
| 27 | 26 | ||
| 28 | } // namespace Fatal | 27 | } // namespace Service::Fatal |
| 29 | } // namespace Service | ||
diff --git a/src/core/hle/service/fatal/fatal_p.cpp b/src/core/hle/service/fatal/fatal_p.cpp index ba194e340..a5254ac2f 100644 --- a/src/core/hle/service/fatal/fatal_p.cpp +++ b/src/core/hle/service/fatal/fatal_p.cpp | |||
| @@ -4,11 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | #include "core/hle/service/fatal/fatal_p.h" | 5 | #include "core/hle/service/fatal/fatal_p.h" |
| 6 | 6 | ||
| 7 | namespace Service { | 7 | namespace Service::Fatal { |
| 8 | namespace Fatal { | ||
| 9 | 8 | ||
| 10 | Fatal_P::Fatal_P(std::shared_ptr<Module> module) | 9 | Fatal_P::Fatal_P(std::shared_ptr<Module> module) |
| 11 | : Module::Interface(std::move(module), "fatal:p") {} | 10 | : Module::Interface(std::move(module), "fatal:p") {} |
| 12 | 11 | ||
| 13 | } // namespace Fatal | 12 | } // namespace Service::Fatal |
| 14 | } // namespace Service | ||
diff --git a/src/core/hle/service/fatal/fatal_p.h b/src/core/hle/service/fatal/fatal_p.h index d77b24bc4..bfd8c8b74 100644 --- a/src/core/hle/service/fatal/fatal_p.h +++ b/src/core/hle/service/fatal/fatal_p.h | |||
| @@ -6,13 +6,11 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/hle/service/fatal/fatal.h" | 7 | #include "core/hle/service/fatal/fatal.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::Fatal { |
| 10 | namespace Fatal { | ||
| 11 | 10 | ||
| 12 | class Fatal_P final : public Module::Interface { | 11 | class Fatal_P final : public Module::Interface { |
| 13 | public: | 12 | public: |
| 14 | explicit Fatal_P(std::shared_ptr<Module> module); | 13 | explicit Fatal_P(std::shared_ptr<Module> module); |
| 15 | }; | 14 | }; |
| 16 | 15 | ||
| 17 | } // namespace Fatal | 16 | } // namespace Service::Fatal |
| 18 | } // namespace Service | ||
diff --git a/src/core/hle/service/fatal/fatal_u.cpp b/src/core/hle/service/fatal/fatal_u.cpp index 065cc868d..26aa9f3b7 100644 --- a/src/core/hle/service/fatal/fatal_u.cpp +++ b/src/core/hle/service/fatal/fatal_u.cpp | |||
| @@ -4,8 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include "core/hle/service/fatal/fatal_u.h" | 5 | #include "core/hle/service/fatal/fatal_u.h" |
| 6 | 6 | ||
| 7 | namespace Service { | 7 | namespace Service::Fatal { |
| 8 | namespace Fatal { | ||
| 9 | 8 | ||
| 10 | Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "fatal:u") { | 9 | Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(module), "fatal:u") { |
| 11 | static const FunctionInfo functions[] = { | 10 | static const FunctionInfo functions[] = { |
| @@ -15,5 +14,4 @@ Fatal_U::Fatal_U(std::shared_ptr<Module> module) : Module::Interface(std::move(m | |||
| 15 | RegisterHandlers(functions); | 14 | RegisterHandlers(functions); |
| 16 | } | 15 | } |
| 17 | 16 | ||
| 18 | } // namespace Fatal | 17 | } // namespace Service::Fatal |
| 19 | } // namespace Service | ||
diff --git a/src/core/hle/service/fatal/fatal_u.h b/src/core/hle/service/fatal/fatal_u.h index 22374755e..9b1a9e97a 100644 --- a/src/core/hle/service/fatal/fatal_u.h +++ b/src/core/hle/service/fatal/fatal_u.h | |||
| @@ -6,13 +6,11 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/hle/service/fatal/fatal.h" | 7 | #include "core/hle/service/fatal/fatal.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::Fatal { |
| 10 | namespace Fatal { | ||
| 11 | 10 | ||
| 12 | class Fatal_U final : public Module::Interface { | 11 | class Fatal_U final : public Module::Interface { |
| 13 | public: | 12 | public: |
| 14 | explicit Fatal_U(std::shared_ptr<Module> module); | 13 | explicit Fatal_U(std::shared_ptr<Module> module); |
| 15 | }; | 14 | }; |
| 16 | 15 | ||
| 17 | } // namespace Fatal | 16 | } // namespace Service::Fatal |
| 18 | } // namespace Service | ||