diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-06 10:15:44 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-06 10:15:44 -0300 |
| commit | 53ce643e520de193c085c0c23046dcbd2e5308a5 (patch) | |
| tree | d8336629c4ce789eb441fc3bd428e317d8ad8e9c /core/pool_allocator.cpp | |
| parent | 99ceddd11ef652a3b8e6bf5d09dcc519d957ce14 (diff) | |
| download | redot-engine-53ce643e520de193c085c0c23046dcbd2e5308a5.tar.gz | |
-Changed memory functions, Memory::alloc_static*, simplified them, made them aligned to 16
-Changed Vector<> template to fit this.
Diffstat (limited to 'core/pool_allocator.cpp')
| -rw-r--r-- | core/pool_allocator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index 00351890c7..e425218060 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -604,7 +604,7 @@ void PoolAllocator::create_pool(void * p_mem,int p_size,int p_max_entries) { PoolAllocator::PoolAllocator(int p_size,bool p_needs_locking,int p_max_entries) { - mem_ptr=Memory::alloc_static( p_size,"PoolAllocator()"); + mem_ptr=memalloc( p_size); ERR_FAIL_COND(!mem_ptr); align=1; create_pool(mem_ptr,p_size,p_max_entries); @@ -648,7 +648,7 @@ PoolAllocator::PoolAllocator(int p_align,int p_size,bool p_needs_locking,int p_m PoolAllocator::~PoolAllocator() { if (mem_ptr) - Memory::free_static( mem_ptr ); + memfree( mem_ptr ); memdelete_arr( entry_array ); memdelete_arr( entry_indices ); |