[Bf-blender-cvs] [5761cb9ee2a] master: Guarded Allocator: add missing operator delete

[Jacques Lucke]

Commit: 5761cb9ee2ac38433751b148ba0a4f7f53d7d6ba
Author: Jacques Lucke
Date:   Tue Jul 7 11:52:45 2020 +0200
Branches: master
https://developer.blender.org/rB5761cb9ee2ac38433751b148ba0a4f7f53d7d6ba

Guarded Allocator: add missing operator delete

This resolves warning C4291 on windows.

===================================================================

M	intern/guardedalloc/MEM_guardedalloc.h

===================================================================

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