diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index a24c2f69f..7e0b9542e 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -20,10 +20,10 @@ SharedPtr<Thread> g_main_thread = nullptr; | |||
| 20 | HandleTable g_handle_table; | 20 | HandleTable g_handle_table; |
| 21 | u64 g_program_id = 0; | 21 | u64 g_program_id = 0; |
| 22 | 22 | ||
| 23 | void WaitObject::AddWaitingThread(Thread* thread) { | 23 | void WaitObject::AddWaitingThread(SharedPtr<Thread> thread) { |
| 24 | auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); | 24 | auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); |
| 25 | if (itr == waiting_threads.end()) | 25 | if (itr == waiting_threads.end()) |
| 26 | waiting_threads.push_back(thread); | 26 | waiting_threads.push_back(std::move(thread)); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | void WaitObject::RemoveWaitingThread(Thread* thread) { | 29 | void WaitObject::RemoveWaitingThread(Thread* thread) { |
| @@ -32,11 +32,11 @@ void WaitObject::RemoveWaitingThread(Thread* thread) { | |||
| 32 | waiting_threads.erase(itr); | 32 | waiting_threads.erase(itr); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | Thread* WaitObject::WakeupNextThread() { | 35 | SharedPtr<Thread> WaitObject::WakeupNextThread() { |
| 36 | if (waiting_threads.empty()) | 36 | if (waiting_threads.empty()) |
| 37 | return nullptr; | 37 | return nullptr; |
| 38 | 38 | ||
| 39 | auto next_thread = waiting_threads.front(); | 39 | auto next_thread = std::move(waiting_threads.front()); |
| 40 | waiting_threads.erase(waiting_threads.begin()); | 40 | waiting_threads.erase(waiting_threads.begin()); |
| 41 | 41 | ||
| 42 | next_thread->ReleaseWaitObject(this); | 42 | next_thread->ReleaseWaitObject(this); |