summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-10-27 21:23:16 -0400
committerGravatar bunnei2014-10-27 21:23:16 -0400
commit19d91a45f50b95e53369444b4a34758e58e96739 (patch)
tree04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/core/hle/kernel/thread.cpp
parentMerge pull request #154 from lioncash/dyncom (diff)
parentAdd `override` keyword through the code. (diff)
downloadyuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.gz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.xz
yuzu-19d91a45f50b95e53369444b4a34758e58e96739.zip
Merge pull request #153 from yuriks/add-override
Add override keyword where appropriate
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 33c0b2a47..e15590c49 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -21,11 +21,11 @@ namespace Kernel {
21class Thread : public Kernel::Object { 21class Thread : public Kernel::Object {
22public: 22public:
23 23
24 std::string GetName() const { return name; } 24 std::string GetName() const override { return name; }
25 std::string GetTypeName() const { return "Thread"; } 25 std::string GetTypeName() const override { return "Thread"; }
26 26
27 static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; } 27 static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; }
28 Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; } 28 Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Thread; }
29 29
30 inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; } 30 inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; }
31 inline bool IsStopped() const { return (status & THREADSTATUS_DORMANT) != 0; } 31 inline bool IsStopped() const { return (status & THREADSTATUS_DORMANT) != 0; }
@@ -38,7 +38,7 @@ public:
38 * @param wait Boolean wait set if current thread should wait as a result of sync operation 38 * @param wait Boolean wait set if current thread should wait as a result of sync operation
39 * @return Result of operation, 0 on success, otherwise error code 39 * @return Result of operation, 0 on success, otherwise error code
40 */ 40 */
41 Result WaitSynchronization(bool* wait) { 41 Result WaitSynchronization(bool* wait) override {
42 if (status != THREADSTATUS_DORMANT) { 42 if (status != THREADSTATUS_DORMANT) {
43 Handle thread = GetCurrentThreadHandle(); 43 Handle thread = GetCurrentThreadHandle();
44 if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) { 44 if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) {