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
path: root/intern
diff options
context:
space:
mode:
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/opencl/memory_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/memory_manager.cpp b/intern/cycles/device/opencl/memory_manager.cpp
index 0285dc969ec..4330e07cb37 100644
--- a/intern/cycles/device/opencl/memory_manager.cpp
+++ b/intern/cycles/device/opencl/memory_manager.cpp
@@ -65,7 +65,7 @@ void MemoryManager::DeviceBuffer::update_device_memory(OpenCLDevice *device)
}
/* Always allocate non-empty buffer, NULL pointers cause problems with some drivers. */
- total_size = max(total_size, 16);
+ total_size = std::max(total_size, (size_t)16);
if (need_realloc) {
cl_ulong max_buffer_size;