diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-13 19:50:11 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-13 19:50:11 -0400 |
commit | fb65076b0f816b6185eaf299eb3ac6178a71fdbb (patch) | |
tree | d060634b99579daa8592df3f433108053061d7b7 /src | |
parent | 3ef134a0920d1a2bbe7659dc9647e77eb0c781c1 (diff) | |
parent | a0e51d8b98b486656f6d0d04a1353e11e5870c0e (diff) |
Merge pull request #1309 from lioncash/nested
service: Use nested namespace specifiers where applicable
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/service/acc/acc_su.h | 6 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.h | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/core/hle/service/acc/acc_su.h b/src/core/hle/service/acc/acc_su.h index a3eb885bf0..fcced063a3 100644 --- a/src/core/hle/service/acc/acc_su.h +++ b/src/core/hle/service/acc/acc_su.h @@ -6,8 +6,7 @@ #include "core/hle/service/acc/acc.h" -namespace Service { -namespace Account { +namespace Service::Account { class ACC_SU final : public Module::Interface { public: @@ -16,5 +15,4 @@ public: ~ACC_SU() override; }; -} // namespace Account -} // namespace Service +} // namespace Service::Account diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index 34f98fe5a5..fd98d541d3 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp @@ -9,8 +9,7 @@ #include "core/core.h" #include "core/hle/service/nvflinger/buffer_queue.h" -namespace Service { -namespace NVFlinger { +namespace Service::NVFlinger { BufferQueue::BufferQueue(u32 id, u64 layer_id) : id(id), layer_id(layer_id) { auto& kernel = Core::System::GetInstance().Kernel(); @@ -104,5 +103,4 @@ u32 BufferQueue::Query(QueryType type) { return 0; } -} // namespace NVFlinger -} // namespace Service +} // namespace Service::NVFlinger diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h index 17c81928ab..50b767732b 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.h +++ b/src/core/hle/service/nvflinger/buffer_queue.h @@ -15,8 +15,7 @@ namespace CoreTiming { struct EventType; } -namespace Service { -namespace NVFlinger { +namespace Service::NVFlinger { struct IGBPBuffer { u32_le magic; @@ -98,5 +97,4 @@ private: Kernel::SharedPtr<Kernel::Event> buffer_wait_event; }; -} // namespace NVFlinger -} // namespace Service +} // namespace Service::NVFlinger |