Merge pull request InsightSoftwareConsortium#4681 from andrei-sandor/…

…WwarningsSupressedNullptr COMP: Fix zero as null pointer constant
N-Dekker · May 20, 2024 · 5279be5 · 5279be5
2 parents ea7b1ab + f39300c
commit 5279be5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Modules/Core/Common/test/itkSmartPointerGTest.cxx b/Modules/Core/Common/test/itkSmartPointerGTest.cxx
@@ -129,12 +129,34 @@ TEST(SmartPointer, EmptyAndNull)
   cptr = nullptr;
   EXPECT_TRUE(cptr.IsNull());
 
+#if defined(__clang__) && defined(__has_warning)
+#  if __has_warning("-Wzero-as-null-pointer-constant")
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#  endif
+#endif
   // NOLINTNEXTLINE(modernize-use-nullptr)
   ptr = NULL; // Do not change NULL, null, Null in this file. This file intentionally contains usage of legacy NULL
+#if defined(__clang__) && defined(__has_warning)
+#  if __has_warning("-Wzero-as-null-pointer-constant")
+#    pragma clang diagnostic pop
+#  endif
+#endif
   EXPECT_TRUE(ptr.IsNull());
 
+#if defined(__clang__) && defined(__has_warning)
+#  if __has_warning("-Wzero-as-null-pointer-constant")
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#  endif
+#endif
   // NOLINTNEXTLINE(modernize-use-nullptr)
   cptr = NULL; // Do not change NULL, null, Null in this file. This file intentionally contains usage of legacy NULL
+#if defined(__clang__) && defined(__has_warning)
+#  if __has_warning("-Wzero-as-null-pointer-constant")
+#    pragma clang diagnostic pop
+#  endif
+#endif
   EXPECT_TRUE(cptr.IsNull());
 
 

diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h
@@ -32,7 +32,7 @@
   using FrontIterator = QuadEdgeMeshFrontIterator<MeshTypeArg, QEPrimalType>;                                         \
   using ConstFrontIterator = QuadEdgeMeshConstFrontIterator<MeshTypeArg, QEPrimalType>;                               \
                                                                                                                       \
-  virtual FrontIterator BeginFront(QEPrimalType * seed = (QEPrimalType *)0)                                           \
+  virtual FrontIterator BeginFront(QEPrimalType * seed = (QEPrimalType *)nullptr)                                     \
   {                                                                                                                   \
     return (FrontIterator(this, true, seed));                                                                         \
   }                                                                                                                   \