zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-29 16:31:43 +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

2
source/common/scripting/vm/vmframe.cpp
View file

@ -746,7 +746,7 @@ ADD_STAT(VM)
for (auto d : VMCycles)
{
added += d.TimeMS();
peak = MAX<double>(peak, d.TimeMS());
peak = max<double>(peak, d.TimeMS());
}
for (auto d : VMCalls) addedc += d;
memmove(&VMCycles[1], &VMCycles[0], 9 * sizeof(cycle_t));