summaryrefslogtreecommitdiffstats
path: root/core/os/os.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-01-31 10:33:18 +0100
committerGitHub <noreply@github.com>2019-01-31 10:33:18 +0100
commit463123a661151f119132f2ee9af78925a58a068a (patch)
tree5ee378a7edf6b191916bccafcf2e9837c89a16ae /core/os/os.cpp
parent6225b17d5f51f936c4f00c5f7d2f3e9f3328ec96 (diff)
parent496d8f19fcad1acd466161ad389552ee93b70d87 (diff)
downloadredot-engine-463123a661151f119132f2ee9af78925a58a068a.tar.gz
Merge pull request #25494 from RandomShaper/fix-21677
Let memory stat functions return uint64_t
Diffstat (limited to 'core/os/os.cpp')
-rw-r--r--core/os/os.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 1f967030e7..d2d39d253a 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -393,16 +393,16 @@ Error OS::dialog_input_text(String p_title, String p_description, String p_parti
return OK;
};
-int OS::get_static_memory_usage() const {
+uint64_t OS::get_static_memory_usage() const {
return Memory::get_mem_usage();
}
-int OS::get_dynamic_memory_usage() const {
+uint64_t OS::get_dynamic_memory_usage() const {
return MemoryPool::total_memory;
}
-int OS::get_static_memory_peak_usage() const {
+uint64_t OS::get_static_memory_peak_usage() const {
return Memory::get_mem_max_usage();
}
@@ -418,7 +418,7 @@ bool OS::has_touchscreen_ui_hint() const {
return Input::get_singleton() && Input::get_singleton()->is_emulating_touch_from_mouse();
}
-int OS::get_free_static_memory() const {
+uint64_t OS::get_free_static_memory() const {
return Memory::get_mem_available();
}