piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the min/max functions in CommonFuncs.

Browse Source 
The algorithm header has the same functions.
This commit is contained in:
Lioncash
2014-05-02 22:47:04 -04:00
parent 3097345929
commit 49b0eef393
29 changed files with 104 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/CompressedBlob.cpp
View File

@ -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++)
{

2
Source/Core/DiscIO/FileSystemGCWii.cpp
View File

@ -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);

3
Source/Core/DiscIO/stdafx.h
View File

@ -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