diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-09 22:30:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 22:30:01 -0400 |
| commit | 571523de384fb5f129d1e8317647ca735da514b0 (patch) | |
| tree | ae153d2d1a330f0b18ea12d227aced970974e543 /src/core/file_sys | |
| parent | ff382d3e36555b8ce84fa3b5237bf139c8502549 (diff) | |
| parent | 3454b332387f0e76a7f78c0befa4854fcb0cd68b (diff) | |
Merge pull request #1461 from lioncash/warn
ips_layer: Silence truncation and conversion warnings
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/ips_layer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/ips_layer.cpp b/src/core/file_sys/ips_layer.cpp index 6c072d0a39..554eae9bca 100644 --- a/src/core/file_sys/ips_layer.cpp +++ b/src/core/file_sys/ips_layer.cpp @@ -107,12 +107,12 @@ VirtualFile PatchIPS(const VirtualFile& in, const VirtualFile& ips) { return nullptr; if (real_offset + rle_size > in_data.size()) - rle_size = in_data.size() - real_offset; + rle_size = static_cast<u16>(in_data.size() - real_offset); std::memset(in_data.data() + real_offset, data.get(), rle_size); } else { // Standard Patch auto read = data_size; if (real_offset + read > in_data.size()) - read = in_data.size() - real_offset; + read = static_cast<u16>(in_data.size() - real_offset); if (ips->Read(in_data.data() + real_offset, read, offset) != data_size) return nullptr; offset += data_size; @@ -265,7 +265,7 @@ void IPSwitchCompiler::Parse() { if (patch_line.length() < 11) break; auto offset = std::stoul(patch_line.substr(0, 8), nullptr, 16); - offset += offset_shift; + offset += static_cast<unsigned long>(offset_shift); std::vector<u8> replace; // 9 - first char of replacement val |
