diff options
author | Zach Hilman <zachhilman@gmail.com> | 2019-06-21 02:31:17 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2019-09-30 23:28:23 +0200 |
commit | bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f (patch) | |
tree | a63e45e3d4d53667357f927987374fa151a08f6b /src/core/hle/service/bcat/module.cpp | |
parent | bcat: Implement DeliveryCacheProgressImpl structure (diff) | |
download | yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar.gz yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar.bz2 yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar.lz yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar.xz yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.tar.zst yuzu-bcf1eafb8bd1a810fd33a7e7e06a86173b4bfb9f.zip |
Diffstat (limited to 'src/core/hle/service/bcat/module.cpp')
-rw-r--r-- | src/core/hle/service/bcat/module.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp index d5f9e9d3b..1b9a75a1c 100644 --- a/src/core/hle/service/bcat/module.cpp +++ b/src/core/hle/service/bcat/module.cpp @@ -195,7 +195,7 @@ private: const auto passphrase_raw = ctx.ReadBuffer(); LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id, - Common::HexVectorToString(passphrase_raw)); + Common::HexToString(passphrase_raw)); if (title_id == 0) { LOG_ERROR(Service_BCAT, "Invalid title ID!"); @@ -335,7 +335,7 @@ private: rb.Push(ERROR_NO_OPEN_ENTITY); } - size = std::min(current_file->GetSize() - offset, size); + size = std::min<u64>(current_file->GetSize() - offset, size); const auto buffer = current_file->ReadBytes(size, offset); ctx.WriteBuffer(buffer); @@ -437,7 +437,7 @@ private: } const auto files = current_dir->GetFiles(); - write_size = std::min(write_size, files.size()); + write_size = std::min<u64>(write_size, files.size()); std::vector<DeliveryCacheDirectoryEntry> entries(write_size); std::transform( files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) { @@ -519,7 +519,7 @@ private: LOG_DEBUG(Service_BCAT, "called, size={:016X}", size); - size = std::min(size, entries.size() - next_read_index); + size = std::min<u64>(size, entries.size() - next_read_index); ctx.WriteBuffer(entries.data() + next_read_index, size * sizeof(DirectoryName)); next_read_index += size; |