From 563a540dfdefde7414832d00290fcb08fb359200 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 1 May 2020 23:32:41 -0400 Subject: [PATCH] core: Resolve -Wreorder warnings Ensures the initialization order matches the actual order that the class member variables will be initialized in. --- src/core/hle/kernel/hle_ipc.cpp | 2 +- src/core/hle/kernel/vm_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 88bd6b71b..a706c0936 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp @@ -21,7 +21,7 @@ class HLERequestContext::ThreadCallback : public Kernel::WakeupCallback { public: ThreadCallback(std::shared_ptr context_, std::shared_ptr callback_) - : context(std::move(context_)), callback(std::move(callback_)) {} + : callback(std::move(callback_)), context(std::move(context_)) {} void WakeUp(ThreadWakeupReason reason, std::shared_ptr thread, std::shared_ptr object) { ASSERT(thread->status == ThreadStatus::WaitHleEvent); diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 83541b2b2..a554a2a5b 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -38,7 +38,7 @@ bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { } VMManager::VMManager(Memory::MemorySystem& memory) - : memory(memory), page_table(std::make_shared()) { + : page_table(std::make_shared()), memory(memory) { Reset(); }