diff options
author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
---|---|---|
committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/blenlib/intern/BLI_memarena.c | |
parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/blenlib/intern/BLI_memarena.c')
-rw-r--r-- | source/blender/blenlib/intern/BLI_memarena.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c index 0ab27a5adad..f1fc3bba4ea 100644 --- a/source/blender/blenlib/intern/BLI_memarena.c +++ b/source/blender/blenlib/intern/BLI_memarena.c @@ -179,16 +179,6 @@ void *BLI_memarena_calloc(MemArena *ma, size_t size) return ptr; } -/** - * Transfer ownership of allocated blocks from `ma_src` into `ma_dst`, - * cleaning the contents of `ma_src`. - * - * \note Useful for multi-threaded tasks that need a thread-local #MemArena - * that is kept after the multi-threaded operation is completed. - * - * \note Avoid accumulating memory pools where possible - * as any unused memory in `ma_src` is wasted every merge. - */ void BLI_memarena_merge(MemArena *ma_dst, MemArena *ma_src) { /* Memory arenas must be compatible. */ @@ -231,10 +221,6 @@ void BLI_memarena_merge(MemArena *ma_dst, MemArena *ma_src) VALGRIND_CREATE_MEMPOOL(ma_src, 0, false); } -/** - * Clear for reuse, avoids re-allocation when an arena may - * otherwise be free'd and recreated. - */ void BLI_memarena_clear(MemArena *ma) { if (ma->bufs) { |