diff options
| author | 2020-10-20 22:08:53 -0400 | |
|---|---|---|
| committer | 2020-10-20 22:08:53 -0400 | |
| commit | 2e74b79e89fe1e6a21fe0d8650844e563b3c32f5 (patch) | |
| tree | 0dbc65ac86e609ae22087c7be9d4759ac6b73004 /src/core/hle/kernel/synchronization.cpp | |
| parent | kernel: Fix build with recent compiler flag changes (diff) | |
| parent | Revert "core: Fix clang build" (diff) | |
| download | yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.gz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.tar.xz yuzu-2e74b79e89fe1e6a21fe0d8650844e563b3c32f5.zip | |
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( | |||
| 51 | // We found a ready object, acquire it and set the result value | 51 | // We found a ready object, acquire it and set the result value |
| 52 | SynchronizationObject* object = itr->get(); | 52 | SynchronizationObject* object = itr->get(); |
| 53 | object->Acquire(thread); | 53 | object->Acquire(thread); |
| 54 | const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr)); | 54 | const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr)); |
| 55 | lock.CancelSleep(); | 55 | lock.CancelSleep(); |
| 56 | return {RESULT_SUCCESS, index}; | 56 | return {RESULT_SUCCESS, index}; |
| 57 | } | 57 | } |
| @@ -105,7 +105,7 @@ std::pair<ResultCode, Handle> Synchronization::WaitFor( | |||
| 105 | }); | 105 | }); |
| 106 | ASSERT(itr != sync_objects.end()); | 106 | ASSERT(itr != sync_objects.end()); |
| 107 | signaling_object->Acquire(thread); | 107 | signaling_object->Acquire(thread); |
| 108 | const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr)); | 108 | const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr)); |
| 109 | return {signaling_result, index}; | 109 | return {signaling_result, index}; |
| 110 | } | 110 | } |
| 111 | return {signaling_result, -1}; | 111 | return {signaling_result, -1}; |