From 9d9764c1c9b84b8e8d3ab47e4fe6748879ab6e36 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Thu, 7 Dec 2023 10:39:03 +1100
Subject: [PATCH] Cleanup: remove redundant define checks
Also reformat checks to quiet warnings so they don't read as empty
define checks.
---
intern/eigen/intern/matrix.cc | 3 ++-
intern/eigen/intern/svd.cc | 3 ++-
source/blender/blenkernel/intern/blender.cc | 3 ++-
source/blender/blenlib/intern/array_store.c | 3 ++-
source/blender/bmesh/tools/bmesh_intersect.cc | 2 --
source/blender/editors/space_script/space_script.cc | 3 ---
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/intern/eigen/intern/matrix.cc b/intern/eigen/intern/matrix.cc
index fef212ac04d..2a4bc0e6bd2 100644
--- a/intern/eigen/intern/matrix.cc
+++ b/intern/eigen/intern/matrix.cc
@@ -14,7 +14,8 @@
# pragma GCC diagnostic ignored "-Wlogical-op"
#endif
-#ifdef __EIGEN3_MATRIX_C_API_CC__ /* quiet warning */
+#ifdef __EIGEN3_MATRIX_C_API_CC__
+/* Quiet warning. */
#endif
#include <Eigen/Core>
diff --git a/intern/eigen/intern/svd.cc b/intern/eigen/intern/svd.cc
index 0bccab7ce3e..6d4bb50cc35 100644
--- a/intern/eigen/intern/svd.cc
+++ b/intern/eigen/intern/svd.cc
@@ -14,7 +14,8 @@
# pragma GCC diagnostic ignored "-Wlogical-op"
#endif
-#ifdef __EIGEN3_SVD_C_API_CC__ /* quiet warning */
+#ifdef __EIGEN3_SVD_C_API_CC__
+/* Quiet warning. */
#endif
#include <Eigen/Core>
diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc
index b5d7ec3b818..dbfbde97c2f 100644
--- a/source/blender/blenkernel/intern/blender.cc
+++ b/source/blender/blenkernel/intern/blender.cc
@@ -323,7 +323,8 @@ static void userdef_free_addons(UserDef *userdef)
void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
{
#define U BLI_STATIC_ASSERT(false, "Global 'U' not allowed, only use arguments passed in!")
-#ifdef U /* quiet warning */
+#ifdef U
+ /* Quiet warning. */
#endif
userdef_free_keymaps(userdef);
diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c
index a435f8f037a..51c4aa8b387 100644
--- a/source/blender/blenlib/intern/array_store.c
+++ b/source/blender/blenlib/intern/array_store.c
@@ -1159,7 +1159,8 @@ static BChunkList *bchunk_list_from_data_merge(const BArrayInfo *info,
/* Warning, from now on don't use len(data) since we want to ignore chunks already matched. */
size_t data_len = data_len_original;
#define data_len_original invalid_usage
-#ifdef data_len_original /* Quiet warning. */
+#ifdef data_len_original
+ /* Quiet warning. */
#endif
const BChunkRef *chunk_list_reference_last = NULL;
diff --git a/source/blender/bmesh/tools/bmesh_intersect.cc b/source/blender/bmesh/tools/bmesh_intersect.cc
index 3560030b4b5..de805730b53 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.cc
+++ b/source/blender/bmesh/tools/bmesh_intersect.cc
@@ -30,8 +30,6 @@
#include "BLI_linklist_stack.h"
#include "BLI_utildefines_stack.h"
-#ifndef NDEBUG
-#endif
#include "BLI_buffer.h"
#include "BLI_kdopbvh.h"
diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc
index 6b80f449cd6..4f8f4b2d596 100644
--- a/source/blender/editors/space_script/space_script.cc
+++ b/source/blender/editors/space_script/space_script.cc
@@ -28,9 +28,6 @@
#include "BLO_read_write.hh"
-#ifdef WITH_PYTHON
-#endif
-
#include "script_intern.h" /* own include */
// static script_run_python(char *funcname, )
--
GitLab