diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-20 05:31:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 05:31:04 +0200 |
| commit | 7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560 (patch) | |
| tree | c806783957549f1127c7d8bfda28abefa5b3ab8d /src/core | |
| parent | Merge pull request #4113 from ogniK5377/boxcat-disable (diff) | |
| parent | bootmanager: Remove references to OpenGL for macOS (diff) | |
| download | yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.gz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.bz2 yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.lz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.xz yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.tar.zst yuzu-7d1dca4c981d04bcb18cd5ecc6a4fe3f71d85560.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/system_archive/shared_font.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory/memory_manager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/system_archive/shared_font.cpp b/src/core/file_sys/system_archive/shared_font.cpp index 2c05eb42e..c5cdf7d9b 100644 --- a/src/core/file_sys/system_archive/shared_font.cpp +++ b/src/core/file_sys/system_archive/shared_font.cpp @@ -23,7 +23,7 @@ VirtualFile PackBFTTF(const std::array<u8, Size>& data, const std::string& name) std::vector<u8> bfttf(Size + sizeof(u64)); - u64 offset = 0; + size_t offset = 0; Service::NS::EncryptSharedFont(vec, bfttf, offset); return std::make_shared<VectorVfsFile>(std::move(bfttf), name); } diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp index 6b432e1b2..616148190 100644 --- a/src/core/hle/kernel/memory/memory_manager.cpp +++ b/src/core/hle/kernel/memory/memory_manager.cpp @@ -104,7 +104,7 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa // Ensure that we don't leave anything un-freed auto group_guard = detail::ScopeExit([&] { for (const auto& it : page_list.Nodes()) { - const auto min_num_pages{std::min( + const auto min_num_pages{std::min<size_t>( it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)}; chosen_manager.Free(it.GetAddress(), min_num_pages); } @@ -165,7 +165,7 @@ ResultCode MemoryManager::Free(PageLinkedList& page_list, std::size_t num_pages, // Free all of the pages for (const auto& it : page_list.Nodes()) { - const auto min_num_pages{std::min( + const auto min_num_pages{std::min<size_t>( it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)}; chosen_manager.Free(it.GetAddress(), min_num_pages); } |