diff options
| author | Michael Maltese <michaeljosephmaltese@gmail.com> | 2016-12-02 21:25:45 -0800 |
|---|---|---|
| committer | Michael Maltese <michaeljosephmaltese@gmail.com> | 2016-12-02 21:26:18 -0800 |
| commit | f798bcd5c02184cc175e674082dfaf189a08c761 (patch) | |
| tree | f4cd63c37cf75e08554a7d7fd321c84713e946c7 /Source/Core | |
| parent | 0e93bad73703ac895ab3327e0e7c8abad6a7e3b8 (diff) | |
DolphinQt2: InfoWidget: explicit type for std::min
Avoids errors on macOS:
```
Source/Core/DolphinQt2/Config/InfoWidget.cpp:190:21: error: no matching function for call to 'min'
u64 read_size = std::min(file_data.size(), game_size - read_offset);
^~~~~~~~
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/algorithm:2589:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('unsigned long' vs. 'unsigned long long')
min(const _Tp& __a, const _Tp& __b)
```
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/InfoWidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.cpp b/Source/Core/DolphinQt2/Config/InfoWidget.cpp index bdf1aa6b89..ffba82cf72 100644 --- 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; |