diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-31 10:33:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 10:33:18 +0100 |
| commit | 463123a661151f119132f2ee9af78925a58a068a (patch) | |
| tree | 5ee378a7edf6b191916bccafcf2e9837c89a16ae /core/bind/core_bind.cpp | |
| parent | 6225b17d5f51f936c4f00c5f7d2f3e9f3328ec96 (diff) | |
| parent | 496d8f19fcad1acd466161ad389552ee93b70d87 (diff) | |
Merge pull request #25494 from RandomShaper/fix-21677
Let memory stat functions return uint64_t
Diffstat (limited to 'core/bind/core_bind.cpp')
| -rw-r--r-- | core/bind/core_bind.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index e81468e888..f17d7372e2 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -592,17 +592,17 @@ struct Time { }; */ -int _OS::get_static_memory_usage() const { +uint64_t _OS::get_static_memory_usage() const { return OS::get_singleton()->get_static_memory_usage(); } -int _OS::get_static_memory_peak_usage() const { +uint64_t _OS::get_static_memory_peak_usage() const { return OS::get_singleton()->get_static_memory_peak_usage(); } -int _OS::get_dynamic_memory_usage() const { +uint64_t _OS::get_dynamic_memory_usage() const { return OS::get_singleton()->get_dynamic_memory_usage(); } |