diff options
| author | LC <mathew1800@gmail.com> | 2020-10-20 22:08:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 22:08:53 -0400 |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/core/hle/kernel/synchronization.cpp | |
| parent | fdd91540695594c4b015f234325a950a5e6566e9 (diff) | |
| parent | 3d592972dc3fd61cc88771b889eff237e4e03e0f (diff) | |
Merge pull request #4814 from yuzu-emu/revert-4796-clang
Revert "core: Fix clang build"
Diffstat (limited to 'src/core/hle/kernel/synchronization.cpp')
| -rw-r--r-- | src/core/hle/kernel/synchronization.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/synchronization.cpp b/src/core/hle/kernel/synchronization.cpp index 653f722b3..8b875d853 100644 --- a/src/core/hle/kernel/synchronization.cpp +++ b/src/core/hle/kernel/synchronization.cpp @@ -51,7 +51,7 @@ std::pair<ResultCode, Handle> Synchronization::WaitFor( // We found a ready object, acquire it and set the result value SynchronizationObject* object = itr->get(); object->Acquire(thread); - const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr)); + const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr)); lock.CancelSleep(); return {RESULT_SUCCESS, index}; } @@ -105,7 +105,7 @@ std::pair<ResultCode, Handle> Synchronization::WaitFor( }); ASSERT(itr != sync_objects.end()); signaling_object->Acquire(thread); - const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr)); + const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr)); return {signaling_result, index}; } return {signaling_result, -1}; |
