diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-01 02:26:16 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-02 18:37:08 +0100 |
commit | 52f58e64efbf43c114f701eb8f39fb463138ffb8 (patch) | |
tree | eb40cc649b524febe841e463d6de7bce025a8105 /src/core/hle/kernel/kernel.h | |
parent | Explicitly instantiate constructors/destructors for Kernel objects (diff) | |
download | yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar.gz yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar.bz2 yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar.lz yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar.xz yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.tar.zst yuzu-52f58e64efbf43c114f701eb8f39fb463138ffb8.zip |
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r-- | src/core/hle/kernel/kernel.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index bf5b47a61..4d8e388b6 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -136,25 +136,26 @@ public: * Add a thread to wait on this object * @param thread Pointer to thread to add */ - void AddWaitingThread(Thread* thread); + void AddWaitingThread(SharedPtr<Thread> thread); /** * Removes a thread from waiting on this object (e.g. if it was resumed already) * @param thread Pointer to thread to remove */ - void RemoveWaitingThread(Thread* thead); + void RemoveWaitingThread(Thread* thread); /** * Wake up the next thread waiting on this object * @return Pointer to the thread that was resumed, nullptr if no threads are waiting */ - Thread* WakeupNextThread(); + SharedPtr<Thread> WakeupNextThread(); /// Wake up all threads waiting on this object void WakeupAllWaitingThreads(); private: - std::vector<Thread*> waiting_threads; ///< Threads waiting for this object to become available + /// Threads waiting for this object to become available + std::vector<SharedPtr<Thread>> waiting_threads; }; /** @@ -275,7 +276,6 @@ private: }; extern HandleTable g_handle_table; -extern SharedPtr<Thread> g_main_thread; /// The ID code of the currently running game /// TODO(Subv): This variable should not be here, |