diff options
| author | bunnei <bunneidev@gmail.com> | 2014-10-27 21:23:16 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-10-27 21:23:16 -0400 |
| commit | 19d91a45f50b95e53369444b4a34758e58e96739 (patch) | |
| tree | 04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/core/hle/kernel/event.cpp | |
| parent | ae311eb3ef835307dbec4de4d3101bb23cf4c326 (diff) | |
| parent | d72708c1f58225f50c5ddecbd6f51580a2d9690b (diff) | |
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 { class Event : public Object { public: - std::string GetTypeName() const { return "Event"; } - std::string GetName() const { return name; } + std::string GetTypeName() const override { return "Event"; } + std::string GetName() const override { return name; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } - Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; } + Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Event; } ResetType intitial_reset_type; ///< ResetType specified at Event initialization ResetType reset_type; ///< Current ResetType @@ -35,7 +35,7 @@ public: * @param wait Boolean wait set if current thread should wait as a result of sync operation * @return Result of operation, 0 on success, otherwise error code */ - Result WaitSynchronization(bool* wait) { + Result WaitSynchronization(bool* wait) override { *wait = locked; if (locked) { Handle thread = GetCurrentThreadHandle(); |
