diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:34:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:34:26 +0300 |
| commit | 74a3d9b410e671b81b6b41e16dd9b158882521d3 (patch) | |
| tree | dd34df2dee0f6b47739434a363504bf20ba31d34 /intern/cycles/util | |
| parent | 1bbe770030a93c38e4fd95f4e65009385c33ab34 (diff) | |
| parent | 3866161da855d2b35ac48ef55958bcb567d4a740 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_guarded_allocator.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h index 2c6f1790fd0..99edf77e2c7 100644 --- a/intern/cycles/util/util_guarded_allocator.h +++ b/intern/cycles/util/util_guarded_allocator.h @@ -97,18 +97,6 @@ public: return *this; } - void construct(T *p, const T& val) - { - if(p != NULL) { - new ((T *)p) T(val); - } - } - - void destroy(T *p) - { - p->~T(); - } - size_t max_size() const { return size_t(-1); |