diff options
| author | 2020-10-15 14:49:45 -0400 | |
|---|---|---|
| committer | 2020-10-17 19:50:39 -0400 | |
| commit | be1954e04cb5a0c3a526f78ed5490a5e65310280 (patch) | |
| tree | 267db7ae4be88dbbc288fa605e35d4a2a13839f6 /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #4787 from lioncash/conversion (diff) | |
| download | yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.gz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.xz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.zip | |
core: Fix clang build
Recent changes to the build system that made more warnings be flagged as
errors caused building via clang to break.
Fixes #4795
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index bafd1ced7..b8623e831 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -482,7 +482,8 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr | |||
| 482 | static ResultCode WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, | 482 | static ResultCode WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address, |
| 483 | s32 handle_count, u32 timeout_high, Handle* index) { | 483 | s32 handle_count, u32 timeout_high, Handle* index) { |
| 484 | const s64 nano_seconds{(static_cast<s64>(timeout_high) << 32) | static_cast<s64>(timeout_low)}; | 484 | const s64 nano_seconds{(static_cast<s64>(timeout_high) << 32) | static_cast<s64>(timeout_low)}; |
| 485 | return WaitSynchronization(system, index, handles_address, handle_count, nano_seconds); | 485 | return WaitSynchronization(system, index, handles_address, static_cast<u32>(handle_count), |
| 486 | nano_seconds); | ||
| 486 | } | 487 | } |
| 487 | 488 | ||
| 488 | /// Resumes a thread waiting on WaitSynchronization | 489 | /// Resumes a thread waiting on WaitSynchronization |
| @@ -2002,7 +2003,7 @@ static ResultCode GetThreadCoreMask(Core::System& system, Handle thread_handle, | |||
| 2002 | return ERR_INVALID_HANDLE; | 2003 | return ERR_INVALID_HANDLE; |
| 2003 | } | 2004 | } |
| 2004 | 2005 | ||
| 2005 | *core = thread->GetIdealCore(); | 2006 | *core = static_cast<u32>(thread->GetIdealCore()); |
| 2006 | *mask = thread->GetAffinityMask(); | 2007 | *mask = thread->GetAffinityMask(); |
| 2007 | 2008 | ||
| 2008 | return RESULT_SUCCESS; | 2009 | return RESULT_SUCCESS; |
| @@ -2070,7 +2071,7 @@ static ResultCode SetThreadCoreMask(Core::System& system, Handle thread_handle, | |||
| 2070 | return ERR_INVALID_HANDLE; | 2071 | return ERR_INVALID_HANDLE; |
| 2071 | } | 2072 | } |
| 2072 | 2073 | ||
| 2073 | return thread->SetCoreAndAffinityMask(core, affinity_mask); | 2074 | return thread->SetCoreAndAffinityMask(static_cast<s32>(core), affinity_mask); |
| 2074 | } | 2075 | } |
| 2075 | 2076 | ||
| 2076 | static ResultCode SetThreadCoreMask32(Core::System& system, Handle thread_handle, u32 core, | 2077 | static ResultCode SetThreadCoreMask32(Core::System& system, Handle thread_handle, u32 core, |