Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-07-07 13:31:10 +0300
committerJacques Lucke <jacques@blender.org>2020-07-07 13:31:25 +0300
commit02cd1595390e44106299701b3449e62c98c69d78 (patch)
tree7643f6ab54f6679063a32511ef228bffb59fb181 /intern/guardedalloc
parentcc311e4a5275e22b9adfec5b2e8cc1b02edf02f7 (diff)
Cleanup: add comment explaining operator delete
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h4
1 files changed, 3 insertions, 1 deletions
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*/) \
{ \
}