Fix the macos build after D71575.

size_t and uint64_t are spelled slightly differently on macOS, which was
causing the compiler to error out calling std::min - since the two types have
to be the same.

I fixed this by casting the uint64_t computation to a size_t.  That's probably
not the cleanest solution, but it gets us back to building.
This commit is contained in:
Jim Ingham
2020-01-15 18:10:31 -08:00
parent 77eb1b8f63
commit cd9e5c3230

View File

@@ -367,7 +367,7 @@ DataExtractor ObjectFileWasm::ReadImageData(uint64_t offset, size_t size) {
DataExtractor data;
if (m_file) {
if (offset < GetByteSize()) {
size = std::min(size, GetByteSize() - offset);
size = std::min(size, (size_t) (GetByteSize() - offset));
auto buffer_sp = MapFileData(m_file, size, offset);
return DataExtractor(buffer_sp, GetByteOrder(), GetAddressByteSize());
}