diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/hle/kernel/event.h | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/hle/kernel/event.h')
| -rw-r--r-- | src/core/hle/kernel/event.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 73d0da419..6fe74065d 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | |||
| 9 | #include "core/hle/kernel/kernel.h" | 8 | #include "core/hle/kernel/kernel.h" |
| 10 | 9 | ||
| 11 | namespace Kernel { | 10 | namespace Kernel { |
| @@ -16,7 +15,6 @@ enum class ResetType { | |||
| 16 | Pulse, | 15 | Pulse, |
| 17 | }; | 16 | }; |
| 18 | 17 | ||
| 19 | |||
| 20 | class Event final : public WaitObject { | 18 | class Event final : public WaitObject { |
| 21 | public: | 19 | public: |
| 22 | /** | 20 | /** |
| @@ -26,16 +24,22 @@ public: | |||
| 26 | */ | 24 | */ |
| 27 | static SharedPtr<Event> Create(ResetType reset_type, std::string name = "Unknown"); | 25 | static SharedPtr<Event> Create(ResetType reset_type, std::string name = "Unknown"); |
| 28 | 26 | ||
| 29 | std::string GetTypeName() const override { return "Event"; } | 27 | std::string GetTypeName() const override { |
| 30 | std::string GetName() const override { return name; } | 28 | return "Event"; |
| 29 | } | ||
| 30 | std::string GetName() const override { | ||
| 31 | return name; | ||
| 32 | } | ||
| 31 | 33 | ||
| 32 | static const HandleType HANDLE_TYPE = HandleType::Event; | 34 | static const HandleType HANDLE_TYPE = HandleType::Event; |
| 33 | HandleType GetHandleType() const override { return HANDLE_TYPE; } | 35 | HandleType GetHandleType() const override { |
| 36 | return HANDLE_TYPE; | ||
| 37 | } | ||
| 34 | 38 | ||
| 35 | ResetType reset_type; ///< Current ResetType | 39 | ResetType reset_type; ///< Current ResetType |
| 36 | 40 | ||
| 37 | bool signaled; ///< Whether the event has already been signaled | 41 | bool signaled; ///< Whether the event has already been signaled |
| 38 | std::string name; ///< Name of event (optional) | 42 | std::string name; ///< Name of event (optional) |
| 39 | 43 | ||
| 40 | bool ShouldWait() override; | 44 | bool ShouldWait() override; |
| 41 | void Acquire() override; | 45 | void Acquire() override; |