summaryrefslogtreecommitdiffstats
path: root/core/os/os.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-07 18:25:37 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-07 18:26:38 -0300
commit2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch)
tree7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /core/os/os.cpp
parent2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff)
downloadredot-engine-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.gz
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
Diffstat (limited to 'core/os/os.cpp')
-rw-r--r--core/os/os.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 7333d667db..82500f5423 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -371,7 +371,7 @@ int OS::get_static_memory_usage() const {
}
int OS::get_dynamic_memory_usage() const{
- return Memory::get_dynamic_mem_usage();
+ return MemoryPool::total_memory;
}
int OS::get_static_memory_peak_usage() const {