diff options
| author | 2018-01-19 18:01:41 -0500 | |
|---|---|---|
| committer | 2018-01-19 18:01:41 -0500 | |
| commit | dd62f125c359b37d71be6ccf873177c1a108d015 (patch) | |
| tree | 0d543402a25f4ba701dc547808b289daa0fc325b /src/core/hle/kernel | |
| parent | Merge pull request #112 from Rozelette/master (diff) | |
| download | yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip | |
Fixes some cast warnings, partial port of citra #3064 (#106)
* Fixes some cast warnings, partially fixes citra #3064
* Converted casts to uint32_t to u32
* Ran clang-format
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/condition_variable.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/condition_variable.cpp b/src/core/hle/kernel/condition_variable.cpp index 5942eae61..561666384 100644 --- a/src/core/hle/kernel/condition_variable.cpp +++ b/src/core/hle/kernel/condition_variable.cpp | |||
| @@ -43,7 +43,7 @@ void ConditionVariable::Acquire(Thread* thread) { | |||
| 43 | ResultCode ConditionVariable::Release(s32 target) { | 43 | ResultCode ConditionVariable::Release(s32 target) { |
| 44 | if (target == -1) { | 44 | if (target == -1) { |
| 45 | // When -1, wake up all waiting threads | 45 | // When -1, wake up all waiting threads |
| 46 | SetAvailableCount(GetWaitingThreads().size()); | 46 | SetAvailableCount(static_cast<s32>(GetWaitingThreads().size())); |
| 47 | WakeupAllWaitingThreads(); | 47 | WakeupAllWaitingThreads(); |
| 48 | } else { | 48 | } else { |
| 49 | // Otherwise, wake up just a single thread | 49 | // Otherwise, wake up just a single thread |
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index 73bb6a8be..3899dad09 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -210,7 +210,7 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P | |||
| 210 | 210 | ||
| 211 | for (auto& object : domain_objects) { | 211 | for (auto& object : domain_objects) { |
| 212 | request_handlers.emplace_back(object); | 212 | request_handlers.emplace_back(object); |
| 213 | dst_cmdbuf[domain_offset++] = request_handlers.size(); | 213 | dst_cmdbuf[domain_offset++] = static_cast<u32_le>(request_handlers.size()); |
| 214 | } | 214 | } |
| 215 | } | 215 | } |
| 216 | return RESULT_SUCCESS; | 216 | return RESULT_SUCCESS; |