diff options
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: | |||
| 136 | * Add a thread to wait on this object | 136 | * Add a thread to wait on this object |
| 137 | * @param thread Pointer to thread to add | 137 | * @param thread Pointer to thread to add |
| 138 | */ | 138 | */ |
| 139 | void AddWaitingThread(Thread* thread); | 139 | void AddWaitingThread(SharedPtr<Thread> thread); |
| 140 | 140 | ||
| 141 | /** | 141 | /** |
| 142 | * Removes a thread from waiting on this object (e.g. if it was resumed already) | 142 | * Removes a thread from waiting on this object (e.g. if it was resumed already) |
| 143 | * @param thread Pointer to thread to remove | 143 | * @param thread Pointer to thread to remove |
| 144 | */ | 144 | */ |
| 145 | void RemoveWaitingThread(Thread* thead); | 145 | void RemoveWaitingThread(Thread* thread); |
| 146 | 146 | ||
| 147 | /** | 147 | /** |
| 148 | * Wake up the next thread waiting on this object | 148 | * Wake up the next thread waiting on this object |
| 149 | * @return Pointer to the thread that was resumed, nullptr if no threads are waiting | 149 | * @return Pointer to the thread that was resumed, nullptr if no threads are waiting |
| 150 | */ | 150 | */ |
| 151 | Thread* WakeupNextThread(); | 151 | SharedPtr<Thread> WakeupNextThread(); |
| 152 | 152 | ||
| 153 | /// Wake up all threads waiting on this object | 153 | /// Wake up all threads waiting on this object |
| 154 | void WakeupAllWaitingThreads(); | 154 | void WakeupAllWaitingThreads(); |
| 155 | 155 | ||
| 156 | private: | 156 | private: |
| 157 | std::vector<Thread*> waiting_threads; ///< Threads waiting for this object to become available | 157 | /// Threads waiting for this object to become available |
| 158 | std::vector<SharedPtr<Thread>> waiting_threads; | ||
| 158 | }; | 159 | }; |
| 159 | 160 | ||
| 160 | /** | 161 | /** |
| @@ -275,7 +276,6 @@ private: | |||
| 275 | }; | 276 | }; |
| 276 | 277 | ||
| 277 | extern HandleTable g_handle_table; | 278 | extern HandleTable g_handle_table; |
| 278 | extern SharedPtr<Thread> g_main_thread; | ||
| 279 | 279 | ||
| 280 | /// The ID code of the currently running game | 280 | /// The ID code of the currently running game |
| 281 | /// TODO(Subv): This variable should not be here, | 281 | /// TODO(Subv): This variable should not be here, |