summaryrefslogtreecommitdiffstats
path: root/core/os/memory_pool_dynamic_static.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-06 10:15:44 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-06 10:15:44 -0300
commit53ce643e520de193c085c0c23046dcbd2e5308a5 (patch)
treed8336629c4ce789eb441fc3bd428e317d8ad8e9c /core/os/memory_pool_dynamic_static.cpp
parent99ceddd11ef652a3b8e6bf5d09dcc519d957ce14 (diff)
downloadredot-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/os/memory_pool_dynamic_static.cpp')
-rw-r--r--core/os/memory_pool_dynamic_static.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/memory_pool_dynamic_static.cpp b/core/os/memory_pool_dynamic_static.cpp
index 9db4916cbd..b7a1bbc19f 100644
--- a/core/os/memory_pool_dynamic_static.cpp
+++ b/core/os/memory_pool_dynamic_static.cpp
@@ -221,7 +221,7 @@ Error MemoryPoolDynamicStatic::unlock(ID p_id) {
size_t MemoryPoolDynamicStatic::get_available_mem() const {
- return Memory::get_static_mem_available();
+ return Memory::get_mem_available();
}
size_t MemoryPoolDynamicStatic::get_total_usage() const {