From c45ee0eb9833813f6ac90817617874235173de69 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 Aug 2025 11:18:29 +1000 Subject: [PATCH] Cleanup: quiet compiler warnings Suppressing "null-pointer-subtraction" was needed for clang but caused a warning with GCC. --- intern/cycles/blender/shader.cpp | 10 +++++----- intern/cycles/util/md5.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/intern/cycles/blender/shader.cpp b/intern/cycles/blender/shader.cpp index 3a0b21a0af2..1aefbb107a9 100644 --- a/intern/cycles/blender/shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -1710,11 +1710,11 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d, PointerRNA cvisibility = RNA_pointer_get(&b_world.ptr, "cycles_visibility"); uint visibility = 0; - visibility |= get_boolean(cvisibility, "camera") ? PATH_RAY_CAMERA : 0; - visibility |= get_boolean(cvisibility, "diffuse") ? PATH_RAY_DIFFUSE : 0; - visibility |= get_boolean(cvisibility, "glossy") ? PATH_RAY_GLOSSY : 0; - visibility |= get_boolean(cvisibility, "transmission") ? PATH_RAY_TRANSMIT : 0; - visibility |= get_boolean(cvisibility, "scatter") ? PATH_RAY_VOLUME_SCATTER : 0; + visibility |= get_boolean(cvisibility, "camera") ? PATH_RAY_CAMERA : PathRayFlag(0); + visibility |= get_boolean(cvisibility, "diffuse") ? PATH_RAY_DIFFUSE : PathRayFlag(0); + visibility |= get_boolean(cvisibility, "glossy") ? PATH_RAY_GLOSSY : PathRayFlag(0); + visibility |= get_boolean(cvisibility, "transmission") ? PATH_RAY_TRANSMIT : PathRayFlag(0); + visibility |= get_boolean(cvisibility, "scatter") ? PATH_RAY_VOLUME_SCATTER : PathRayFlag(0); background->set_visibility(visibility); } diff --git a/intern/cycles/util/md5.cpp b/intern/cycles/util/md5.cpp index 8e527e4af3c..12b4dd3ff6c 100644 --- a/intern/cycles/util/md5.cpp +++ b/intern/cycles/util/md5.cpp @@ -103,9 +103,9 @@ void MD5Hash::process(const uint8_t *data /*[64]*/) static const int w = 1; if (*((const uint8_t *)&w)) /* dynamic little-endian */ { -#ifdef __GNUC__ -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wnull-pointer-subtraction" +#if defined(__GNUC__) && defined(__clang__) +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wnull-pointer-subtraction" #endif /* * On little-endian machines, we can process properly aligned @@ -120,8 +120,8 @@ void MD5Hash::process(const uint8_t *data /*[64]*/) memcpy(xbuf, data, 64); X = xbuf; } -#ifdef __GNUC__ -# pragma GCC diagnostic pop +#if defined(__GNUC__) && defined(__clang__) +# pragma clang diagnostic pop #endif } else { /* dynamic big-endian */