From 53ce643e520de193c085c0c23046dcbd2e5308a5 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 6 Jan 2017 10:15:44 -0300 Subject: -Changed memory functions, Memory::alloc_static*, simplified them, made them aligned to 16 -Changed Vector<> template to fit this. --- drivers/unix/os_unix.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/unix/os_unix.cpp') diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index f6266c8fc..1e8b76f50 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -30,7 +30,7 @@ #ifdef UNIX_ENABLED -#include "memory_pool_static_malloc.h" + #include "os/memory_pool_dynamic_static.h" #include "thread_posix.h" #include "semaphore_posix.h" @@ -116,7 +116,6 @@ int OS_Unix::unix_initialize_audio(int p_audio_driver) { return 0; } -static MemoryPoolStaticMalloc *mempool_static=NULL; static MemoryPoolDynamicStatic *mempool_dynamic=NULL; @@ -145,7 +144,6 @@ void OS_Unix::initialize_core() { PacketPeerUDPPosix::make_default(); IP_Unix::make_default(); #endif - mempool_static = new MemoryPoolStaticMalloc; mempool_dynamic = memnew( MemoryPoolDynamicStatic ); ticks_start=0; @@ -157,7 +155,6 @@ void OS_Unix::finalize_core() { if (mempool_dynamic) memdelete( mempool_dynamic ); - delete mempool_static; } -- cgit v1.2.3-70-g09d2