aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/event.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-20 18:16:45 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-21 20:47:49 -0500
commit15b6a4d9add6b260a2a1a84ab6228addced4f851 (patch)
treee9934863ebd6483cabae0f6c280fab7e34eee32e /src/core/hle/kernel/event.cpp
parentc68eb1569549ae49ae25c6c29cec2e10d8329f2d (diff)
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.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index bed85602..cdacba1d 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -28,16 +28,16 @@ public:
bool signaled; ///< Whether the event has already been signaled
std::string name; ///< Name of event (optional)
- ResultVal<bool> ShouldWait() override {
- return MakeResult<bool>(!signaled);
+ bool ShouldWait() override {
+ return !signaled;
}
- ResultVal<bool> Acquire() override {
+ void Acquire() override {
+ _assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
+
// Release the event if it's not sticky...
if (reset_type != RESETTYPE_STICKY)
signaled = false;
-
- return MakeResult<bool>(true);
}
};