diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-12 19:10:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 16:00:36 +0300 |
| commit | 3866161da855d2b35ac48ef55958bcb567d4a740 (patch) | |
| tree | e019dee67c4149dbaecae6bd2c60972e3fadcacb /intern/cycles/device | |
| parent | 2a9c8da709593b5b6187002797d9bb4363440bd5 (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/device')
| -rw-r--r-- | intern/cycles/device/device.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 317e62b2f69..327ba8e2a59 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -457,10 +457,10 @@ void Device::tag_update() void Device::free_memory() { devices_initialized_mask = 0; - cuda_devices.clear(); - opencl_devices.clear(); - cpu_devices.clear(); - network_devices.clear(); + cuda_devices.free_memory(); + opencl_devices.free_memory(); + cpu_devices.free_memory(); + network_devices.free_memory(); } CCL_NAMESPACE_END |