diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
| commit | 8fc83d8ffca75f86c144a7798ebf0661a1eb68ef (patch) | |
| tree | 741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/DiscIO/FileSystemGCWii.cpp | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
| parent | 49b0eef393f4d321928fb0b6093d58a7637cf1da (diff) | |
Merge pull request #334 from lioncash/use-std-minmax
Remove the min/max functions in CommonFuncs.
Diffstat (limited to 'Source/Core/DiscIO/FileSystemGCWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index cdd830c6f6..a264eb0ffb 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -104,7 +104,7 @@ bool CFileSystemGCWii::ExportFile(const std::string& _rFullPath, const std::stri while (remainingSize) { // Limit read size to 128 MB - size_t readSize = (size_t)min(remainingSize, (u64)0x08000000); + size_t readSize = std::min<size_t>(remainingSize, (u64)0x08000000); std::vector<u8> buffer(readSize); |