[Bf-blender-cvs] [fd2ea3a] master: Cycles: Make guarded allocator happy about strict C++ flags
Sergey Sharybin
noreply at git.blender.org
Thu Apr 2 12:51:52 CEST 2015
Commit: fd2ea3a90941f319beb9346869efcef05979e7a8
Author: Sergey Sharybin
Date: Thu Apr 2 15:06:40 2015 +0500
Branches: master
https://developer.blender.org/rBfd2ea3a90941f319beb9346869efcef05979e7a8
Cycles: Make guarded allocator happy about strict C++ flags
===================================================================
M intern/cycles/util/util_guarded_allocator.h
===================================================================
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h
index 2631994..c4edb17 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<T>::allocate(n, hint);
More information about the Bf-blender-cvs
mailing list