midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5316 from lioncash/init

Browse Source 
core: Resolve -Wreorder warnings
This commit is contained in:
Pengfei Zhu 2020-05-02 15:42:31 +08:00 committed by GitHub
commit 41bff0e3b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/kernel/hle_ipc.cpp
View File

@ -21,7 +21,7 @@ class HLERequestContext::ThreadCallback : public Kernel::WakeupCallback {
public: public:
ThreadCallback(std::shared_ptr<HLERequestContext> context_, ThreadCallback(std::shared_ptr<HLERequestContext> context_,
std::shared_ptr<HLERequestContext::WakeupCallback> callback_) std::shared_ptr<HLERequestContext::WakeupCallback> 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> thread, void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
std::shared_ptr<WaitObject> object) { std::shared_ptr<WaitObject> object) {
ASSERT(thread->status == ThreadStatus::WaitHleEvent); ASSERT(thread->status == ThreadStatus::WaitHleEvent);

2
src/core/hle/kernel/vm_manager.cpp
View File

@ -38,7 +38,7 @@ bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const {
} }
VMManager::VMManager(Memory::MemorySystem& memory) VMManager::VMManager(Memory::MemorySystem& memory)
: memory(memory), page_table(std::make_shared<Memory::PageTable>()) { : page_table(std::make_shared<Memory::PageTable>()), memory(memory) {
Reset(); Reset();
} }