Merge pull request #4485 from ligfx/fixmin

DolphinQt2: InfoWidget: explicit type for std::min
dolphin-emu · Dec 3, 2016 · 827de2e · 827de2e
2 parents 0e93bad + f798bcd
commit 827de2e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.cpp b/Source/Core/DolphinQt2/Config/InfoWidget.cpp
@@ -187,7 +187,7 @@ void InfoWidget::ComputeChecksum()
     if (progress->wasCanceled())
       return;
 
-    u64 read_size = std::min(file_data.size(), game_size - read_offset);
+    u64 read_size = std::min<u64>(file_data.size(), game_size - read_offset);
     file->Read(read_offset, read_size, file_data.data());
     hash.addData(reinterpret_cast<char*>(file_data.data()), read_size);
     read_offset += read_size;