From 468adfa4fd9fab09f2ceeca40ab3c72e071931c6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 3 Jul 2020 12:21:05 +0200 Subject: [PATCH] Guarded allocator: Override placement new operator Allows to in-place construct objects which are using guarded allocator. --- intern/guardedalloc/MEM_guardedalloc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index bbba69edf1d..55ea1d0bb70 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -239,6 +239,10 @@ void MEM_use_guarded_allocator(void); { \ if (mem) \ MEM_freeN(mem); \ + } \ + void *operator new(size_t /*count*/, void *ptr) \ + { \ + return ptr; \ } /* Needed when type includes a namespace, then the namespace should not be