diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-02 13:06:40 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-04-02 13:51:43 +0300 |
| commit | fd2ea3a90941f319beb9346869efcef05979e7a8 (patch) | |
| tree | 25081c2b4e28097b5e8328e4effab0d10f0e9f53 /intern/cycles/util | |
| parent | f30b60d1397d8109d6fb25188eace7b8d3a7e1d5 (diff) | |
Cycles: Make guarded allocator happy about strict C++ flags
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_guarded_allocator.h | 1 |
1 files changed, 1 insertions, 0 deletions
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<T>::allocate(n, hint); |