diff options
| author | 2017-09-27 00:26:09 +0100 | |
|---|---|---|
| committer | 2017-09-30 09:34:35 +0100 | |
| commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/svc.cpp | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| download | yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip | |
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 05c6897bf..41c82c922 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -361,7 +361,7 @@ static ResultCode WaitSynchronizationN(s32* out, Kernel::Handle* handles, s32 ha | |||
| 361 | // We found a ready object, acquire it and set the result value | 361 | // We found a ready object, acquire it and set the result value |
| 362 | Kernel::WaitObject* object = itr->get(); | 362 | Kernel::WaitObject* object = itr->get(); |
| 363 | object->Acquire(thread); | 363 | object->Acquire(thread); |
| 364 | *out = std::distance(objects.begin(), itr); | 364 | *out = static_cast<s32>(std::distance(objects.begin(), itr)); |
| 365 | return RESULT_SUCCESS; | 365 | return RESULT_SUCCESS; |
| 366 | } | 366 | } |
| 367 | 367 | ||
| @@ -469,7 +469,7 @@ static ResultCode ReplyAndReceive(s32* index, Kernel::Handle* handles, s32 handl | |||
| 469 | // We found a ready object, acquire it and set the result value | 469 | // We found a ready object, acquire it and set the result value |
| 470 | Kernel::WaitObject* object = itr->get(); | 470 | Kernel::WaitObject* object = itr->get(); |
| 471 | object->Acquire(thread); | 471 | object->Acquire(thread); |
| 472 | *index = std::distance(objects.begin(), itr); | 472 | *index = static_cast<s32>(std::distance(objects.begin(), itr)); |
| 473 | 473 | ||
| 474 | if (object->GetHandleType() == Kernel::HandleType::ServerSession) { | 474 | if (object->GetHandleType() == Kernel::HandleType::ServerSession) { |
| 475 | auto server_session = static_cast<Kernel::ServerSession*>(object); | 475 | auto server_session = static_cast<Kernel::ServerSession*>(object); |
| @@ -683,7 +683,7 @@ static void ExitThread() { | |||
| 683 | } | 683 | } |
| 684 | 684 | ||
| 685 | /// Gets the priority for the specified thread | 685 | /// Gets the priority for the specified thread |
| 686 | static ResultCode GetThreadPriority(s32* priority, Kernel::Handle handle) { | 686 | static ResultCode GetThreadPriority(u32* priority, Kernel::Handle handle) { |
| 687 | const SharedPtr<Kernel::Thread> thread = Kernel::g_handle_table.Get<Kernel::Thread>(handle); | 687 | const SharedPtr<Kernel::Thread> thread = Kernel::g_handle_table.Get<Kernel::Thread>(handle); |
| 688 | if (thread == nullptr) | 688 | if (thread == nullptr) |
| 689 | return ERR_INVALID_HANDLE; | 689 | return ERR_INVALID_HANDLE; |
| @@ -693,7 +693,7 @@ static ResultCode GetThreadPriority(s32* priority, Kernel::Handle handle) { | |||
| 693 | } | 693 | } |
| 694 | 694 | ||
| 695 | /// Sets the priority for the specified thread | 695 | /// Sets the priority for the specified thread |
| 696 | static ResultCode SetThreadPriority(Kernel::Handle handle, s32 priority) { | 696 | static ResultCode SetThreadPriority(Kernel::Handle handle, u32 priority) { |
| 697 | if (priority > THREADPRIO_LOWEST) { | 697 | if (priority > THREADPRIO_LOWEST) { |
| 698 | return Kernel::ERR_OUT_OF_RANGE; | 698 | return Kernel::ERR_OUT_OF_RANGE; |
| 699 | } | 699 | } |