diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-14 16:05:24 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-14 16:06:23 +0300 |
| commit | b63ffa89199a941e2f5fd26cad5c9b60087a6a20 (patch) | |
| tree | 4597da11d93c5c7d330a18c800a87cae093705ac /intern/cycles/util/util_aligned_malloc.h | |
| parent | 0dd5281ab295361bea348874cf841a5937352ba3 (diff) | |
Fix Cycles build error after recent changes
We need to do aligned alloc of the services instead of globals now since the
concurrent map moved there.
Diffstat (limited to 'intern/cycles/util/util_aligned_malloc.h')
| -rw-r--r-- | intern/cycles/util/util_aligned_malloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_aligned_malloc.h b/intern/cycles/util/util_aligned_malloc.h index 7115e4cb0c6..df7d93c056d 100644 --- a/intern/cycles/util/util_aligned_malloc.h +++ b/intern/cycles/util/util_aligned_malloc.h @@ -31,10 +31,10 @@ void *util_aligned_malloc(size_t size, int alignment); void util_aligned_free(void *ptr); /* Aligned new operator. */ -template<typename T> T *util_aligned_new() +template<typename T, typename... Args> T *util_aligned_new(Args... args) { void *mem = util_aligned_malloc(sizeof(T), alignof(T)); - return new (mem) T(); + return new (mem) T(args...); } template<typename T> void util_aligned_delete(T *t) |