diff options
| author | 2016-03-12 15:06:31 -0500 | |
|---|---|---|
| committer | 2016-03-12 15:06:31 -0500 | |
| commit | 12e92f17de40522e66954d3c5148e4520c9ca775 (patch) | |
| tree | 0de55470238cb9579f7c190f044957c7bf76bdee /src/core/hle/kernel | |
| parent | Merge pull request #1266 from Subv/miiapplet (diff) | |
| download | yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.gz yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.tar.xz yuzu-12e92f17de40522e66954d3c5148e4520c9ca775.zip | |
svc: Make ResetType an enum class
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 53feebbc0..2b7c6992a 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -35,7 +35,7 @@ void Event::Acquire() { | |||
| 35 | ASSERT_MSG(!ShouldWait(), "object unavailable!"); | 35 | ASSERT_MSG(!ShouldWait(), "object unavailable!"); |
| 36 | 36 | ||
| 37 | // Release the event if it's not sticky... | 37 | // Release the event if it's not sticky... |
| 38 | if (reset_type != RESETTYPE_STICKY) | 38 | if (reset_type != ResetType::Sticky) |
| 39 | signaled = false; | 39 | signaled = false; |
| 40 | } | 40 | } |
| 41 | 41 | ||
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index ce6bbd719..b8daaeede 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -43,7 +43,7 @@ bool Timer::ShouldWait() { | |||
| 43 | void Timer::Acquire() { | 43 | void Timer::Acquire() { |
| 44 | ASSERT_MSG( !ShouldWait(), "object unavailable!"); | 44 | ASSERT_MSG( !ShouldWait(), "object unavailable!"); |
| 45 | 45 | ||
| 46 | if (reset_type == RESETTYPE_ONESHOT) | 46 | if (reset_type == ResetType::OneShot) |
| 47 | signaled = false; | 47 | signaled = false; |
| 48 | } | 48 | } |
| 49 | 49 | ||