diff options
| author | 2015-01-20 18:16:45 -0500 | |
|---|---|---|
| committer | 2015-01-21 20:47:49 -0500 | |
| commit | 15b6a4d9add6b260a2a1a84ab6228addced4f851 (patch) | |
| tree | e9934863ebd6483cabae0f6c280fab7e34eee32e /src/core/hle/kernel/event.cpp | |
| parent | WaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" p... (diff) | |
| download | yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.gz yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.tar.xz yuzu-15b6a4d9add6b260a2a1a84ab6228addced4f851.zip | |
Kernel: Changed "ShouldWait" to return bool and "Acquire" to return void.
Diffstat (limited to 'src/core/hle/kernel/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index bed856020..cdacba1d9 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -28,16 +28,16 @@ public: | |||
| 28 | bool signaled; ///< Whether the event has already been signaled | 28 | bool signaled; ///< Whether the event has already been signaled |
| 29 | std::string name; ///< Name of event (optional) | 29 | std::string name; ///< Name of event (optional) |
| 30 | 30 | ||
| 31 | ResultVal<bool> ShouldWait() override { | 31 | bool ShouldWait() override { |
| 32 | return MakeResult<bool>(!signaled); | 32 | return !signaled; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | ResultVal<bool> Acquire() override { | 35 | void Acquire() override { |
| 36 | _assert_msg_(Kernel, !ShouldWait(), "object unavailable!"); | ||
| 37 | |||
| 36 | // Release the event if it's not sticky... | 38 | // Release the event if it's not sticky... |
| 37 | if (reset_type != RESETTYPE_STICKY) | 39 | if (reset_type != RESETTYPE_STICKY) |
| 38 | signaled = false; | 40 | signaled = false; |
| 39 | |||
| 40 | return MakeResult<bool>(true); | ||
| 41 | } | 41 | } |
| 42 | }; | 42 | }; |
| 43 | 43 | ||