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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-12 19:10:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-13 16:00:36 +0300
commit3866161da855d2b35ac48ef55958bcb567d4a740 (patch)
treee019dee67c4149dbaecae6bd2c60972e3fadcacb /intern/cycles/util
parent2a9c8da709593b5b6187002797d9bb4363440bd5 (diff)
Fix T61457, T61489, T61482: build errors and memory warning in Cycles.
For OIIO 2.x we must use unique_ptr. This also required updating the guarded allocator for std::move to work. Since C++11 construct/destroy have a default implementation that also works this case, so we just leave it out.
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_guarded_allocator.h12
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);