Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Compile fix

Browse source
This commit is contained in:
kaetemi 2014-06-20 17:53:38 +02:00
parent d7a4d6898b
commit 871fa848df
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/object_arena_allocator.cpp
View file

@ -68,7 +68,7 @@ void *CObjectArenaAllocator::alloc(uint size)
if (size >= _MaxAllocSize) if (size >= _MaxAllocSize)
{ {
// use standard allocator // use standard allocator
nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT > sizeof(uint)); nlctassert(NL_DEFAULT_MEMORY_ALIGNMENT >= sizeof(uint));
uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block uint8 *block = (uint8 *)aligned_malloc(NL_DEFAULT_MEMORY_ALIGNMENT + size, NL_DEFAULT_MEMORY_ALIGNMENT); //new uint8[size + sizeof(uint)]; // an additionnal uint is needed to store size of block
if (!block) return NULL; if (!block) return NULL;
#ifdef NL_DEBUG #ifdef NL_DEBUG