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 /platform | |
| parent | 99ceddd11ef652a3b8e6bf5d09dcc519d957ce14 (diff) | |
-Changed memory functions, Memory::alloc_static*, simplified them, made them aligned to 16
-Changed Vector<> template to fit this.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/os_windows.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 84db94db23..97ed8d7ae0 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -30,7 +30,6 @@ #include "os_windows.h" #include "drivers/gles3/rasterizer_gles3.h" -#include "drivers/unix/memory_pool_static_malloc.h" #include "os/memory_pool_dynamic_static.h" #include "drivers/windows/thread_windows.h" #include "drivers/windows/semaphore_windows.h" @@ -167,7 +166,6 @@ const char * OS_Windows::get_audio_driver_name(int p_driver) const { return AudioDriverManagerSW::get_driver(p_driver)->get_name(); } -static MemoryPoolStatic *mempool_static=NULL; static MemoryPoolDynamic *mempool_dynamic=NULL; void OS_Windows::initialize_core() { @@ -196,7 +194,6 @@ void OS_Windows::initialize_core() { StreamPeerWinsock::make_default(); PacketPeerUDPWinsock::make_default(); - mempool_static = new MemoryPoolStaticMalloc; #if 1 mempool_dynamic = memnew( MemoryPoolDynamicStatic ); #else @@ -1308,7 +1305,6 @@ void OS_Windows::finalize_core() { if (mempool_dynamic) memdelete( mempool_dynamic ); - delete mempool_static; TCPServerWinsock::cleanup(); |