diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2017-09-30 08:22:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 08:22:14 -0500 |
| commit | a3de996ae7c41bb8d475b47dcd08abdd571cfc73 (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/kernel/wait_object.cpp | |
| parent | b07af7dda822898e9c8f231c5ddcd1741d93dbef (diff) | |
| parent | a13ab958cbba75bc9abd1ca50f3030a10a75784e (diff) | |
Merge pull request #2962 from huwpascoe/static_cast
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/kernel/wait_object.cpp')
| -rw-r--r-- | src/core/hle/kernel/wait_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp index f245eda6c..56fdd977f 100644 --- a/src/core/hle/kernel/wait_object.cpp +++ b/src/core/hle/kernel/wait_object.cpp @@ -34,7 +34,7 @@ void WaitObject::RemoveWaitingThread(Thread* thread) { SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { Thread* candidate = nullptr; - s32 candidate_priority = THREADPRIO_LOWEST + 1; + u32 candidate_priority = THREADPRIO_LOWEST + 1; for (const auto& thread : waiting_threads) { // The list of waiting threads must not contain threads that are not waiting to be awakened. |