From fd2ea3a90941f319beb9346869efcef05979e7a8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 2 Apr 2015 15:06:40 +0500 Subject: Cycles: Make guarded allocator happy about strict C++ flags --- intern/cycles/util/util_guarded_allocator.h | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h index 263199417c4..c4edb172eb8 100644 --- a/intern/cycles/util/util_guarded_allocator.h +++ b/intern/cycles/util/util_guarded_allocator.h @@ -53,6 +53,7 @@ public: { util_guarded_mem_alloc(n * sizeof(T)); #ifdef WITH_BLENDER_GUARDEDALLOC + (void)hint; return (T*)MEM_mallocN(n * sizeof(T), "Cycles Alloc"); #else return std::allocator::allocate(n, hint); -- cgit v1.2.3