summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/CompressedBlob.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-05-02 22:47:04 -0400
committerLioncash <mathew1800@gmail.com>2014-05-29 21:44:41 -0400
commit49b0eef393f4d321928fb0b6093d58a7637cf1da (patch)
tree741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/DiscIO/CompressedBlob.cpp
parent30973459292d734fac12d1fefaf98edf37ad7976 (diff)
Remove the min/max functions in CommonFuncs.
The algorithm header has the same functions.
Diffstat (limited to 'Source/Core/DiscIO/CompressedBlob.cpp')
-rw-r--r--Source/Core/DiscIO/CompressedBlob.cpp4
1 files changed, 2 insertions, 2 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++)
{