diff options
| author |  Sebastian Valle | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer |  GitHub | 2017-09-30 08:22:14 -0500 |
| commit | a3de996ae7c41bb8d475b47dcd08abdd571cfc73 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/kernel/mutex.cpp | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| parent | Fixed type conversion ambiguity (diff) | |
| download | yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.tar.gz yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.tar.xz yuzu-a3de996ae7c41bb8d475b47dcd08abdd571cfc73.zip | |
Merge pull request #2962 from huwpascoe/static_cast
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index cef961289..2cbca5e5b 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp | |||
| @@ -90,7 +90,7 @@ void Mutex::UpdatePriority() { | |||
| 90 | if (!holding_thread) | 90 | if (!holding_thread) |
| 91 | return; | 91 | return; |
| 92 | 92 | ||
| 93 | s32 best_priority = THREADPRIO_LOWEST; | 93 | u32 best_priority = THREADPRIO_LOWEST; |
| 94 | for (auto& waiter : GetWaitingThreads()) { | 94 | for (auto& waiter : GetWaitingThreads()) { |
| 95 | if (waiter->current_priority < best_priority) | 95 | if (waiter->current_priority < best_priority) |
| 96 | best_priority = waiter->current_priority; | 96 | best_priority = waiter->current_priority; |