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/os/os.h | |
| parent | 6225b17d5f51f936c4f00c5f7d2f3e9f3328ec96 (diff) | |
| parent | 496d8f19fcad1acd466161ad389552ee93b70d87 (diff) | |
| download | redot-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.h')
| -rw-r--r-- | core/os/os.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/os/os.h b/core/os/os.h index 36d4e5a8c1..a08bdcb608 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -382,10 +382,10 @@ public: virtual void print_resources_in_use(bool p_short = false); virtual void print_all_resources(String p_to_file = ""); - virtual int get_static_memory_usage() const; - virtual int get_static_memory_peak_usage() const; - virtual int get_dynamic_memory_usage() const; - virtual int get_free_static_memory() const; + virtual uint64_t get_static_memory_usage() const; + virtual uint64_t get_static_memory_peak_usage() const; + virtual uint64_t get_dynamic_memory_usage() const; + virtual uint64_t get_free_static_memory() const; RenderThreadMode get_render_thread_mode() const { return _render_thread_mode; } |