diff options
author | Lioncash <mathew1800@gmail.com> | 2018-04-20 03:41:44 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-04-20 04:20:28 +0200 |
commit | ccca5e7c2872d477cc7bef73ed141dc093b106ef (patch) | |
tree | 17f5db413993ed4a6f1fec0ac27fb20b44328459 /src/core/hle/service/sm | |
parent | Merge pull request #356 from lioncash/shader (diff) | |
download | yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.gz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.bz2 yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.lz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.xz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.zst yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/sm/controller.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/sm/controller.h | 6 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/sm/sm.h | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp index e12c53442..13e31620d 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/controller.cpp @@ -7,8 +7,7 @@ #include "core/hle/kernel/session.h" #include "core/hle/service/sm/controller.h" -namespace Service { -namespace SM { +namespace Service::SM { void Controller::ConvertSessionToDomain(Kernel::HLERequestContext& ctx) { ASSERT_MSG(!ctx.Session()->IsDomain(), "session is alread a domain"); @@ -58,5 +57,4 @@ Controller::Controller() : ServiceFramework("IpcController") { RegisterHandlers(functions); } -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/controller.h index 7b4bc4b75..a4de52cd2 100644 --- a/src/core/hle/service/sm/controller.h +++ b/src/core/hle/service/sm/controller.h @@ -6,8 +6,7 @@ #include "core/hle/service/service.h" -namespace Service { -namespace SM { +namespace Service::SM { class Controller final : public ServiceFramework<Controller> { public: @@ -21,5 +20,4 @@ private: void QueryPointerBufferSize(Kernel::HLERequestContext& ctx); }; -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index bc72512a0..297a4f2c6 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -12,8 +12,7 @@ #include "core/hle/service/sm/controller.h" #include "core/hle/service/sm/sm.h" -namespace Service { -namespace SM { +namespace Service::SM { void ServiceManager::InvokeControlRequest(Kernel::HLERequestContext& context) { controller_interface->InvokeRequest(context); @@ -132,5 +131,4 @@ SM::SM(std::shared_ptr<ServiceManager> service_manager) RegisterHandlers(functions); } -} // namespace SM -} // namespace Service +} // namespace Service::SM diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h index 11fa788ca..40421cfd5 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/core/hle/service/sm/sm.h @@ -17,8 +17,7 @@ class ServerPort; class SessionRequestHandler; } // namespace Kernel -namespace Service { -namespace SM { +namespace Service::SM { /// Interface to "sm:" service class SM final : public ServiceFramework<SM> { @@ -62,5 +61,4 @@ private: extern std::shared_ptr<ServiceManager> g_service_manager; -} // namespace SM -} // namespace Service +} // namespace Service::SM |