From 5761cb9ee2ac38433751b148ba0a4f7f53d7d6ba Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 7 Jul 2020 11:52:45 +0200 Subject: [PATCH] Guarded Allocator: add missing operator delete This resolves warning C4291 on windows. --- intern/guardedalloc/MEM_guardedalloc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 55ea1d0bb70..e775d1c1b9a 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -243,6 +243,9 @@ void MEM_use_guarded_allocator(void); void *operator new(size_t /*count*/, void *ptr) \ { \ return ptr; \ + } \ + void operator delete(void *, void *) \ + { \ } /* Needed when type includes a namespace, then the namespace should not be