diff options
| author | 2016-09-18 09:38:01 +0900 | |
|---|---|---|
| committer | 2016-09-18 09:38:01 +0900 | |
| commit | dc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch) | |
| tree | 569a7f13128450bbab973236615587ff00bced5f /src/core/hle/kernel/event.h | |
| parent | Travis: Import Dolphin’s clang-format hook. (diff) | |
| download | yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip | |
Sources: Run clang-format on everything.
Diffstat (limited to 'src/core/hle/kernel/event.h')
| -rw-r--r-- | src/core/hle/kernel/event.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 73d0da419..e333a46ce 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -16,7 +16,6 @@ enum class ResetType { | |||
| 16 | Pulse, | 16 | Pulse, |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | |||
| 20 | class Event final : public WaitObject { | 19 | class Event final : public WaitObject { |
| 21 | public: | 20 | public: |
| 22 | /** | 21 | /** |
| @@ -26,16 +25,22 @@ public: | |||
| 26 | */ | 25 | */ |
| 27 | static SharedPtr<Event> Create(ResetType reset_type, std::string name = "Unknown"); | 26 | static SharedPtr<Event> Create(ResetType reset_type, std::string name = "Unknown"); |
| 28 | 27 | ||
| 29 | std::string GetTypeName() const override { return "Event"; } | 28 | std::string GetTypeName() const override { |
| 30 | std::string GetName() const override { return name; } | 29 | return "Event"; |
| 30 | } | ||
| 31 | std::string GetName() const override { | ||
| 32 | return name; | ||
| 33 | } | ||
| 31 | 34 | ||
| 32 | static const HandleType HANDLE_TYPE = HandleType::Event; | 35 | static const HandleType HANDLE_TYPE = HandleType::Event; |
| 33 | HandleType GetHandleType() const override { return HANDLE_TYPE; } | 36 | HandleType GetHandleType() const override { |
| 37 | return HANDLE_TYPE; | ||
| 38 | } | ||
| 34 | 39 | ||
| 35 | ResetType reset_type; ///< Current ResetType | 40 | ResetType reset_type; ///< Current ResetType |
| 36 | 41 | ||
| 37 | bool signaled; ///< Whether the event has already been signaled | 42 | bool signaled; ///< Whether the event has already been signaled |
| 38 | std::string name; ///< Name of event (optional) | 43 | std::string name; ///< Name of event (optional) |
| 39 | 44 | ||
| 40 | bool ShouldWait() override; | 45 | bool ShouldWait() override; |
| 41 | void Acquire() override; | 46 | void Acquire() override; |