From aa2904ea13b5aa72c5eba0c9e094ad8fc4937990 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 7 Nov 2019 11:06:41 +0100 Subject: Cycles: Fix strict compiler warning Pointer used for math arithmetics in assert(). CUDA device pointer is actually an integer type, not a pointer. --- intern/cycles/device/device_optix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp index 3162b72a0dc..831cd8c3148 100644 --- a/intern/cycles/device/device_optix.cpp +++ b/intern/cycles/device/device_optix.cpp @@ -1189,7 +1189,7 @@ class OptiXDevice : public Device { size_t bytes = 0; CUdeviceptr mem = 0; check_result_cuda(cuModuleGetGlobal(&mem, &bytes, cuda_module, name)); - assert(mem != NULL && bytes == data_size); + assert(mem != 0 && bytes == data_size); check_result_cuda(cuMemcpyHtoD(mem, data, data_size)); } -- cgit v1.2.3