diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-03-03 18:37:11 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 17:35:23 +0200 |
commit | b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67 (patch) | |
tree | 3bd41c8e286ed564213b9a580e4df875f2687e25 /src/core/hle/kernel/thread.h | |
parent | Core: Correct HLE Event Callbacks and other issues. (diff) | |
download | yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar.gz yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar.bz2 yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar.lz yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar.xz yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.tar.zst yuzu-b4dc01f16affe4baa9a7ab5ac4b240e03c03ae67.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r-- | src/core/hle/kernel/thread.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index c4c9d69ec..7b6d1b4ec 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -21,7 +21,7 @@ class Fiber; namespace Core { class System; -} +} // namespace Core namespace Kernel { @@ -386,18 +386,18 @@ public: } const ThreadSynchronizationObjects& GetSynchronizationObjects() const { - return wait_objects; + return *wait_objects; } - void SetSynchronizationObjects(ThreadSynchronizationObjects objects) { - wait_objects = std::move(objects); + void SetSynchronizationObjects(ThreadSynchronizationObjects* objects) { + wait_objects = objects; } void ClearSynchronizationObjects() { - for (const auto& waiting_object : wait_objects) { + for (const auto& waiting_object : *wait_objects) { waiting_object->RemoveWaitingThread(SharedFrom(this)); } - wait_objects.clear(); + wait_objects->clear(); } /// Determines whether all the objects this thread is waiting on are ready. @@ -595,7 +595,7 @@ private: /// Objects that the thread is waiting on, in the same order as they were /// passed to WaitSynchronization. - ThreadSynchronizationObjects wait_objects; + ThreadSynchronizationObjects* wait_objects; SynchronizationObject* signaling_object; ResultCode signaling_result{RESULT_SUCCESS}; |