From 49b0eef393f4d321928fb0b6093d58a7637cf1da Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 2 May 2014 22:47:04 -0400 Subject: Remove the min/max functions in CommonFuncs. The algorithm header has the same functions. --- Source/Core/DiscIO/CompressedBlob.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/CompressedBlob.cpp') 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(1, header.num_blocks / 1000); + int progress_monitor = std::max(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(1, header.num_blocks / 100); + int progress_monitor = std::max(1, header.num_blocks / 100); for (u64 i = 0; i < header.num_blocks; i++) { -- cgit v1.2.3