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/jit/jit_runtime.cpp
View file

@ -56,7 +56,7 @@ static void *AllocJitMemory(size_t size)
}
else
{
const size_t bytesToAllocate = std::max(size_t(1024 * 1024), size);
const size_t bytesToAllocate = max(size_t(1024 * 1024), size);
size_t allocatedSize = 0;
void *p = OSUtils::allocVirtualMemory(bytesToAllocate, &allocatedSize, OSUtils::kVMWritable | OSUtils::kVMExecutable);
if (!p)