diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-05-02 22:47:04 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-05-29 21:44:41 -0400 |
| commit | 49b0eef393f4d321928fb0b6093d58a7637cf1da (patch) | |
| tree | 741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/DiscIO | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
Remove the min/max functions in CommonFuncs.
The algorithm header has the same functions.
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/CompressedBlob.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/stdafx.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 98b19f328d..553388b902 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -193,7 +193,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u u64 position = 0; int num_compressed = 0; int num_stored = 0; - int progress_monitor = max<int>(1, header.num_blocks / 1000); + int progress_monitor = std::max<int>(1, header.num_blocks / 1000); for (u32 i = 0; i < header.num_blocks; i++) { @@ -299,7 +299,7 @@ bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, const CompressedBlobHeader &header = reader->GetHeader(); u8* buffer = new u8[header.block_size]; - int progress_monitor = max<int>(1, header.num_blocks / 100); + int progress_monitor = std::max<int>(1, header.num_blocks / 100); for (u64 i = 0; i < header.num_blocks; i++) { 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); diff --git a/Source/Core/DiscIO/stdafx.h b/Source/Core/DiscIO/stdafx.h index 03a92c3b49..19ed0290e7 100644 --- a/Source/Core/DiscIO/stdafx.h +++ b/Source/Core/DiscIO/stdafx.h @@ -8,7 +8,8 @@ #define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. #endif -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define NOMINMAX // Don't include windows min/max definitions #ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE |