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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-08-15 11:36:56 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-08-15 11:36:56 +0400
commit58d7ae891d052fc33c0ceb9e53eb6f224a2222de (patch)
treee59992fc85ffadba73081334b2d414338f1c822d /intern/guardedalloc
parent4006f8c83baf402c64c4032b05aaa257a76f621a (diff)
Blender might be compiled without guardedalloc again
This is useful for benchmark tests, to make CPU cache utilization as good as we could with current design.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/intern/mallocn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 08ac2ce6eff..06ae2ee864d 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -1142,12 +1142,12 @@ void *MEM_dupallocN(const void *vmemh)
return newp;
}
-void *MEM_reallocN(void *vmemh, size_t len)
+void *MEM_reallocN_id(void *vmemh, size_t len, const char *UNUSED(str))
{
return realloc(vmemh, len);
}
-void *MEM_recallocN(void *vmemh, size_t len)
+void *MEM_recallocN_id(void *vmemh, size_t len, const char *UNUSED(str))
{
void *newp = NULL;