diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-01 06:46:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-01 06:46:34 +0400 |
| commit | 9ad5f32fc0e0396257cfdace04c4f12490cdb926 (patch) | |
| tree | 3419f54355beba0963694829488ab747f5c26ff3 /intern/guardedalloc/MEM_guardedalloc.h | |
| parent | 2924a02a3561eed7899d5087f2a7a6c31529e18f (diff) | |
use strict flags for guarded alloc
Diffstat (limited to 'intern/guardedalloc/MEM_guardedalloc.h')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 0939fe1cf86..d5ba2f5bd68 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -190,7 +190,7 @@ extern "C" { * Are the start/end block markers still correct ? * * @retval 0 for correct memory, 1 for corrupted memory. */ - int MEM_check_memory_integrity(void); + bool MEM_check_memory_integrity(void); /** Set thread locking functions for safe memory allocation from multiple * threads, pass NULL pointers to disable thread locking again. */ @@ -207,13 +207,13 @@ extern "C" { /** Get mapped memory usage. */ uintptr_t MEM_get_mapped_memory_in_use(void); /** Get amount of memory blocks in use. */ - int MEM_get_memory_blocks_in_use(void); + unsigned int MEM_get_memory_blocks_in_use(void); /** Reset the peak memory statistic to zero. */ void MEM_reset_peak_memory(void); /** Get the peak memory usage in bytes, including mmap allocations. */ - uintptr_t MEM_get_peak_memory(void) + size_t MEM_get_peak_memory(void) #if MEM_GNU_ATTRIBUTES __attribute__((warn_unused_result)) #endif |