diff options
| author | 2015-02-02 13:04:04 -0500 | |
|---|---|---|
| committer | 2015-02-02 13:04:04 -0500 | |
| commit | 7f730ed158bc9bba064100b9644b318134ef0bb3 (patch) | |
| tree | c4181a69ff882e1af1b7d65bf3596a6cb3dd88b9 /src/core/hle/kernel/event.cpp | |
| parent | Merge pull request #517 from bunnei/blend-factors (diff) | |
| parent | Kernel: Stop creating useless Handles during object creation (diff) | |
| download | yuzu-7f730ed158bc9bba064100b9644b318134ef0bb3.tar.gz yuzu-7f730ed158bc9bba064100b9644b318134ef0bb3.tar.xz yuzu-7f730ed158bc9bba064100b9644b318134ef0bb3.zip | |
Merge pull request #523 from yuriks/kernel-lifetime5
Kernel Lifetime Reform Pt. 5: The Reckoning
Diffstat (limited to 'src/core/hle/kernel/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index d9ad40c6a..898e1c98f 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -14,16 +14,17 @@ | |||
| 14 | 14 | ||
| 15 | namespace Kernel { | 15 | namespace Kernel { |
| 16 | 16 | ||
| 17 | ResultVal<SharedPtr<Event>> Event::Create(ResetType reset_type, std::string name) { | 17 | Event::Event() {} |
| 18 | Event::~Event() {} | ||
| 19 | |||
| 20 | SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) { | ||
| 18 | SharedPtr<Event> evt(new Event); | 21 | SharedPtr<Event> evt(new Event); |
| 19 | // TOOD(yuriks): Don't create Handle (see Thread::Create()) | ||
| 20 | CASCADE_RESULT(auto unused, Kernel::g_handle_table.Create(evt)); | ||
| 21 | 22 | ||
| 22 | evt->signaled = false; | 23 | evt->signaled = false; |
| 23 | evt->reset_type = evt->intitial_reset_type = reset_type; | 24 | evt->reset_type = evt->intitial_reset_type = reset_type; |
| 24 | evt->name = std::move(name); | 25 | evt->name = std::move(name); |
| 25 | 26 | ||
| 26 | return MakeResult<SharedPtr<Event>>(evt); | 27 | return evt; |
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | bool Event::ShouldWait() { | 30 | bool Event::ShouldWait() { |