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/filesystem | |
| 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/filesystem')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index 945832e98..9e504992f 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -10,8 +10,7 @@ | |||
| 10 | #include "core/hle/service/filesystem/filesystem.h" | 10 | #include "core/hle/service/filesystem/filesystem.h" |
| 11 | #include "core/hle/service/filesystem/fsp_srv.h" | 11 | #include "core/hle/service/filesystem/fsp_srv.h" |
| 12 | 12 | ||
| 13 | namespace Service { | 13 | namespace Service::FileSystem { |
| 14 | namespace FileSystem { | ||
| 15 | 14 | ||
| 16 | /** | 15 | /** |
| 17 | * Map of registered file systems, identified by type. Once an file system is registered here, it | 16 | * Map of registered file systems, identified by type. Once an file system is registered here, it |
| @@ -75,5 +74,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) { | |||
| 75 | std::make_shared<FSP_SRV>()->InstallAsService(service_manager); | 74 | std::make_shared<FSP_SRV>()->InstallAsService(service_manager); |
| 76 | } | 75 | } |
| 77 | 76 | ||
| 78 | } // namespace FileSystem | 77 | } // namespace Service::FileSystem |
| 79 | } // namespace Service | ||
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index 45accbf0e..2f476c869 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | #include "core/hle/service/filesystem/filesystem.h" | 14 | #include "core/hle/service/filesystem/filesystem.h" |
| 15 | #include "core/hle/service/filesystem/fsp_srv.h" | 15 | #include "core/hle/service/filesystem/fsp_srv.h" |
| 16 | 16 | ||
| 17 | namespace Service { | 17 | namespace Service::FileSystem { |
| 18 | namespace FileSystem { | ||
| 19 | 18 | ||
| 20 | class IStorage final : public ServiceFramework<IStorage> { | 19 | class IStorage final : public ServiceFramework<IStorage> { |
| 21 | public: | 20 | public: |
| @@ -573,5 +572,4 @@ void FSP_SRV::OpenRomStorage(Kernel::HLERequestContext& ctx) { | |||
| 573 | OpenDataStorageByCurrentProcess(ctx); | 572 | OpenDataStorageByCurrentProcess(ctx); |
| 574 | } | 573 | } |
| 575 | 574 | ||
| 576 | } // namespace FileSystem | 575 | } // namespace Service::FileSystem |
| 577 | } // namespace Service | ||
diff --git a/src/core/hle/service/filesystem/fsp_srv.h b/src/core/hle/service/filesystem/fsp_srv.h index 6dc5874c0..acb78fac1 100644 --- a/src/core/hle/service/filesystem/fsp_srv.h +++ b/src/core/hle/service/filesystem/fsp_srv.h | |||
| @@ -11,8 +11,7 @@ namespace FileSys { | |||
| 11 | class FileSystemBackend; | 11 | class FileSystemBackend; |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | namespace Service { | 14 | namespace Service::FileSystem { |
| 15 | namespace FileSystem { | ||
| 16 | 15 | ||
| 17 | class FSP_SRV final : public ServiceFramework<FSP_SRV> { | 16 | class FSP_SRV final : public ServiceFramework<FSP_SRV> { |
| 18 | public: | 17 | public: |
| @@ -33,5 +32,4 @@ private: | |||
| 33 | std::unique_ptr<FileSys::FileSystemBackend> romfs; | 32 | std::unique_ptr<FileSys::FileSystemBackend> romfs; |
| 34 | }; | 33 | }; |
| 35 | 34 | ||
| 36 | } // namespace FileSystem | 35 | } // namespace Service::FileSystem |
| 37 | } // namespace Service | ||