diff options
| author | 2014-10-27 21:23:16 -0400 | |
|---|---|---|
| committer | 2014-10-27 21:23:16 -0400 | |
| commit | 19d91a45f50b95e53369444b4a34758e58e96739 (patch) | |
| tree | 04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/core/hle/kernel/event.cpp | |
| parent | Merge pull request #154 from lioncash/dyncom (diff) | |
| parent | Add `override` keyword through the code. (diff) | |
| download | yuzu-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/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 64f6a9649..45ed79be8 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -16,11 +16,11 @@ namespace Kernel { | |||
| 16 | 16 | ||
| 17 | class Event : public Object { | 17 | class Event : public Object { |
| 18 | public: | 18 | public: |
| 19 | std::string GetTypeName() const { return "Event"; } | 19 | std::string GetTypeName() const override { return "Event"; } |
| 20 | std::string GetName() const { return name; } | 20 | std::string GetName() const override { return name; } |
| 21 | 21 | ||
| 22 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } | 22 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } |
| 23 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; } | 23 | Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Event; } |
| 24 | 24 | ||
| 25 | ResetType intitial_reset_type; ///< ResetType specified at Event initialization | 25 | ResetType intitial_reset_type; ///< ResetType specified at Event initialization |
| 26 | ResetType reset_type; ///< Current ResetType | 26 | ResetType reset_type; ///< Current ResetType |
| @@ -35,7 +35,7 @@ public: | |||
| 35 | * @param wait Boolean wait set if current thread should wait as a result of sync operation | 35 | * @param wait Boolean wait set if current thread should wait as a result of sync operation |
| 36 | * @return Result of operation, 0 on success, otherwise error code | 36 | * @return Result of operation, 0 on success, otherwise error code |
| 37 | */ | 37 | */ |
| 38 | Result WaitSynchronization(bool* wait) { | 38 | Result WaitSynchronization(bool* wait) override { |
| 39 | *wait = locked; | 39 | *wait = locked; |
| 40 | if (locked) { | 40 | if (locked) { |
| 41 | Handle thread = GetCurrentThreadHandle(); | 41 | Handle thread = GetCurrentThreadHandle(); |