From 02cd1595390e44106299701b3449e62c98c69d78 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 7 Jul 2020 12:31:10 +0200 Subject: [PATCH] Cleanup: add comment explaining operator delete --- intern/guardedalloc/MEM_guardedalloc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index e775d1c1b9a..1318aa10697 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -244,7 +244,9 @@ void MEM_use_guarded_allocator(void); { \ return ptr; \ } \ - void operator delete(void *, void *) \ + /* This is the matching delete operator to the placement-new operator above. Both parameters \ + * will have the same value. Without this, we get the warning C4291 on windows. */ \ + void operator delete(void * /*ptr_to_free*/, void * /*ptr*/) \ { \ }