diff options
author | River City Ransomware <richyateswebdesign@gmail.com> | 2018-01-20 00:01:41 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-01-20 00:01:41 +0100 |
commit | dd62f125c359b37d71be6ccf873177c1a108d015 (patch) | |
tree | 0d543402a25f4ba701dc547808b289daa0fc325b /src/core/hle | |
parent | Merge pull request #112 from Rozelette/master (diff) | |
download | yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.bz2 yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.lz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.zst yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip |
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/kernel/condition_variable.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/vi/vi.cpp | 2 |
3 files changed, 3 insertions, 3 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) { ResultCode ConditionVariable::Release(s32 target) { if (target == -1) { // When -1, wake up all waiting threads - SetAvailableCount(GetWaitingThreads().size()); + SetAvailableCount(static_cast<s32>(GetWaitingThreads().size())); WakeupAllWaitingThreads(); } else { // 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 for (auto& object : domain_objects) { request_handlers.emplace_back(object); - dst_cmdbuf[domain_offset++] = request_handlers.size(); + dst_cmdbuf[domain_offset++] = static_cast<u32_le>(request_handlers.size()); } } return RESULT_SUCCESS; diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 015fb164e..c624e734e 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -95,7 +95,7 @@ public: Header header{}; header.data_offset = sizeof(Header); - header.data_size = write_index - sizeof(Header); + header.data_size = static_cast<u32_le>(write_index - sizeof(Header)); std::memcpy(buffer.data(), &header, sizeof(Header)); return buffer; |