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/os/os.cpp | |
| 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 'core/os/os.cpp')
| -rw-r--r-- | core/os/os.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 75773a9076..7333d667db 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -187,7 +187,7 @@ const char *OS::get_last_error() const { void OS::dump_memory_to_file(const char* p_file) { - Memory::dump_static_mem_to_file(p_file); +// Memory::dump_static_mem_to_file(p_file); } static FileAccess *_OSPRF=NULL; @@ -367,7 +367,7 @@ Error OS::dialog_input_text(String p_title, String p_description, String p_parti int OS::get_static_memory_usage() const { - return Memory::get_static_mem_usage(); + return Memory::get_mem_usage(); } int OS::get_dynamic_memory_usage() const{ @@ -376,7 +376,7 @@ int OS::get_dynamic_memory_usage() const{ int OS::get_static_memory_peak_usage() const { - return Memory::get_static_mem_max_usage(); + return Memory::get_mem_max_usage(); } Error OS::set_cwd(const String& p_cwd) { @@ -392,7 +392,7 @@ bool OS::has_touchscreen_ui_hint() const { int OS::get_free_static_memory() const { - return Memory::get_static_mem_available(); + return Memory::get_mem_available(); } void OS::yield() { |