zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 08:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Replace MAX() from templates.h with version provided in STL.

Browse source 
# Conflicts:
#	source/common/textures/hw_ihwtexture.cpp
#	source/common/utility/templates.h
This commit is contained in:
Mitch Richters 2021-10-30 19:15:01 +11:00 • committed by Christoph Oelckers
parent 57b638f26f
commit 9894729fc2
52 changed files with 115 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/common/objects/dobjgc.cpp
View file

@ -348,7 +348,7 @@ static size_t SingleStep()
State = GCS_Finalize;
}
//assert(old >= AllocBytes);
Estimate -= MAX<size_t>(0, old - AllocBytes);
Estimate -= max<size_t>(0, old - AllocBytes);
return (GCSWEEPMAX - finalize_count) * GCSWEEPCOST + finalize_count * GCFINALIZECOST;
}
@ -625,7 +625,7 @@ CCMD(gc)
}
else
{
GC::Pause = MAX(1,atoi(argv[2]));
GC::Pause = max(1,atoi(argv[2]));
}
}
else if (stricmp(argv[1], "stepmul") == 0)
@ -636,7 +636,7 @@ CCMD(gc)
}
else
{
GC::StepMul = MAX(100, atoi(argv[2]));
GC::StepMul = max(100, atoi(argv[2]));
}
}
}