diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-07 12:52:45 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-07 12:52:45 +0300 |
| commit | 5761cb9ee2ac38433751b148ba0a4f7f53d7d6ba (patch) | |
| tree | 0271c2225e8380fb6d22f5639dcda36e51f5a3ea /intern/guardedalloc | |
| parent | 80fe5e1b15c03ddf363617febf01b8090d1a42b5 (diff) | |
Guarded Allocator: add missing operator delete
This resolves warning C4291 on windows.
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |