From 66bb005ff923aed6b4b082662a1160c6eadfa1da Mon Sep 17 00:00:00 2001 From: Andrei Sandor Date: Thu, 30 May 2024 15:41:03 -0400 Subject: [PATCH] COMP: Remove ; from other itk macros --- .clang-format | 6 +++++ .../Core/Common/include/itkHexahedronCell.h | 2 +- Modules/Core/Common/include/itkLineCell.h | 2 +- Modules/Core/Common/include/itkMath.h | 2 +- .../Core/Common/include/itkNumericTraits.h | 24 +++++++++---------- Modules/Core/Common/include/itkPolyLineCell.h | 2 +- Modules/Core/Common/include/itkPolygonCell.h | 2 +- .../Common/include/itkQuadraticEdgeCell.h | 2 +- .../Common/include/itkQuadraticTriangleCell.h | 2 +- .../Common/include/itkQuadrilateralCell.h | 2 +- .../Core/Common/include/itkTetrahedronCell.h | 2 +- Modules/Core/Common/include/itkTriangleCell.h | 2 +- Modules/Core/Common/include/itkVertexCell.h | 2 +- .../include/itkGeometricalQuadEdge.h | 2 +- .../QuadEdgeMesh/include/itkQuadEdgeMesh.h | 2 +- ...attesMutualInformationImageToImageMetric.h | 2 +- ...etricv4GetValueAndDerivativeThreaderBase.h | 2 +- 17 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.clang-format b/.clang-format index 54f3a797c3f..e741ab3e75b 100644 --- a/.clang-format +++ b/.clang-format @@ -156,6 +156,12 @@ StatementMacros: - INTEL_PRAGMA_WARN_POP - INTEL_SUPPRESS_warning_1292 - itkBooleanMacro + - itkQEDefineFrontIteratorMethodsMacro + - itkQEAccessorsMacro + - itkCellVisitMacro + - itkNUMERIC_TRAITS_MIN_MAX_MACRO + - itkTemplateFloatingToIntegerMacro + - itkPadStruct TabWidth: 2 UseTab: Never ... diff --git a/Modules/Core/Common/include/itkHexahedronCell.h b/Modules/Core/Common/include/itkHexahedronCell.h index cb7fd3f61f0..8b933f327f4 100644 --- a/Modules/Core/Common/include/itkHexahedronCell.h +++ b/Modules/Core/Common/include/itkHexahedronCell.h @@ -154,7 +154,7 @@ class ITK_TEMPLATE_EXPORT HexahedronCell InterpolationWeightType *) override; /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::HEXAHEDRON_CELL); + itkCellVisitMacro(CellGeometryEnum::HEXAHEDRON_CELL) protected: /** Store the number of points needed for a hexahedron. */ diff --git a/Modules/Core/Common/include/itkLineCell.h b/Modules/Core/Common/include/itkLineCell.h index a3f160b3d38..15df8f220ee 100644 --- a/Modules/Core/Common/include/itkLineCell.h +++ b/Modules/Core/Common/include/itkLineCell.h @@ -111,7 +111,7 @@ class ITK_TEMPLATE_EXPORT LineCell : public TCellInterface GetVertex(CellFeatureIdentifier, VertexAutoPointer &); /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::LINE_CELL); + itkCellVisitMacro(CellGeometryEnum::LINE_CELL) LineCell() = default; diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h index c311597d815..55890fab01a 100644 --- a/Modules/Core/Common/include/itkMath.h +++ b/Modules/Core/Common/include/itkMath.h @@ -204,7 +204,7 @@ itkTemplateFloatingToIntegerMacro(Floor); * the default one (or at least that it is always restored to the * default one). */ -itkTemplateFloatingToIntegerMacro(Ceil); +itkTemplateFloatingToIntegerMacro(Ceil) #undef itkTemplateFloatingToIntegerMacro diff --git a/Modules/Core/Common/include/itkNumericTraits.h b/Modules/Core/Common/include/itkNumericTraits.h index ae4bd04fbb2..dee01914360 100644 --- a/Modules/Core/Common/include/itkNumericTraits.h +++ b/Modules/Core/Common/include/itkNumericTraits.h @@ -393,7 +393,7 @@ class NumericTraits : public std::numeric_limits static constexpr char ITKCommon_EXPORT Zero = 0; static constexpr char ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr char NonpositiveMin() @@ -621,7 +621,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned char ITKCommon_EXPORT Zero = 0; static constexpr unsigned char ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned char NonpositiveMin() @@ -724,7 +724,7 @@ class NumericTraits : public std::numeric_limits static constexpr short ITKCommon_EXPORT Zero = 0; static constexpr short ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr short NonpositiveMin() { @@ -827,7 +827,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned short ITKCommon_EXPORT Zero = 0; static constexpr unsigned short ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned short NonpositiveMin() { @@ -929,7 +929,7 @@ class NumericTraits : public std::numeric_limits static constexpr int ITKCommon_EXPORT Zero = 0; static constexpr int ITKCommon_EXPORT One = 1; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr int NonpositiveMin() { @@ -1154,7 +1154,7 @@ class NumericTraits : public std::numeric_limits static constexpr long ITKCommon_EXPORT Zero = 0L; static constexpr long ITKCommon_EXPORT One = 1L; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr long NonpositiveMin() { @@ -1257,7 +1257,7 @@ class NumericTraits : public std::numeric_limits static constexpr unsigned long ITKCommon_EXPORT Zero = 0UL; static constexpr unsigned long ITKCommon_EXPORT One = 1UL; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr unsigned long NonpositiveMin() { @@ -1361,7 +1361,7 @@ class NumericTraits : public std::numeric_limits static constexpr float ITKCommon_EXPORT Zero = 0.0f; static constexpr float ITKCommon_EXPORT One = 1.0f; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr float NonpositiveMin() { @@ -1464,7 +1464,7 @@ class NumericTraits : public std::numeric_limits static constexpr double ITKCommon_EXPORT Zero = 0.0; static constexpr double ITKCommon_EXPORT One = 1.0; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr double NonpositiveMin() { @@ -1575,7 +1575,7 @@ class NumericTraits : public std::numeric_limits static constexpr long double ITKCommon_EXPORT Zero = 0.0; static constexpr long double ITKCommon_EXPORT One = 1.0; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr long double NonpositiveMin() { @@ -1679,7 +1679,7 @@ class NumericTraits : public std::numeric_limits static constexpr ValueType ITKCommon_EXPORT Zero = 0LL; static constexpr ValueType ITKCommon_EXPORT One = 1LL; - itkNUMERIC_TRAITS_MIN_MAX_MACRO(); + itkNUMERIC_TRAITS_MIN_MAX_MACRO() static constexpr ValueType NonpositiveMin() { @@ -1782,7 +1782,7 @@ class NumericTraits : public std::numeric_limits; /** Need to add POLYGON_CELL into CellInterface. */ - itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL); + itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL) /** Implement the standard CellInterface. */ CellGeometryEnum diff --git a/Modules/Core/Common/include/itkQuadraticEdgeCell.h b/Modules/Core/Common/include/itkQuadraticEdgeCell.h index 125275f3ada..1267db8ac57 100644 --- a/Modules/Core/Common/include/itkQuadraticEdgeCell.h +++ b/Modules/Core/Common/include/itkQuadraticEdgeCell.h @@ -106,7 +106,7 @@ class ITK_TEMPLATE_EXPORT QuadraticEdgeCell : public TCellInterface GetVertex(CellFeatureIdentifier, VertexAutoPointer &); /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::QUADRATIC_EDGE_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRATIC_EDGE_CELL) QuadraticEdgeCell() = default; diff --git a/Modules/Core/Common/include/itkQuadraticTriangleCell.h b/Modules/Core/Common/include/itkQuadraticTriangleCell.h index 267ac243d35..2cf2c9a728b 100644 --- a/Modules/Core/Common/include/itkQuadraticTriangleCell.h +++ b/Modules/Core/Common/include/itkQuadraticTriangleCell.h @@ -119,7 +119,7 @@ class ITK_TEMPLATE_EXPORT QuadraticTriangleCell GetEdge(CellFeatureIdentifier, EdgeAutoPointer &); /** Cell visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::QUADRATIC_TRIANGLE_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRATIC_TRIANGLE_CELL) /** Given the parametric coordinates of a point in the cell * determine the value of its Shape Functions diff --git a/Modules/Core/Common/include/itkQuadrilateralCell.h b/Modules/Core/Common/include/itkQuadrilateralCell.h index acf10441a73..601dd869d24 100644 --- a/Modules/Core/Common/include/itkQuadrilateralCell.h +++ b/Modules/Core/Common/include/itkQuadrilateralCell.h @@ -130,7 +130,7 @@ class ITK_TEMPLATE_EXPORT QuadrilateralCell InterpolationWeightType * weight) override; /** Visitor interface */ - itkCellVisitMacro(CellGeometryEnum::QUADRILATERAL_CELL); + itkCellVisitMacro(CellGeometryEnum::QUADRILATERAL_CELL) /** Constructor and destructor */ QuadrilateralCell() = default; diff --git a/Modules/Core/Common/include/itkTetrahedronCell.h b/Modules/Core/Common/include/itkTetrahedronCell.h index 9c62125ff12..6fee0fc3ac3 100644 --- a/Modules/Core/Common/include/itkTetrahedronCell.h +++ b/Modules/Core/Common/include/itkTetrahedronCell.h @@ -165,7 +165,7 @@ class ITK_TEMPLATE_EXPORT TetrahedronCell GetFace(CellFeatureIdentifier, FaceAutoPointer &); /** Visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::TETRAHEDRON_CELL); + itkCellVisitMacro(CellGeometryEnum::TETRAHEDRON_CELL) bool EvaluatePosition(CoordRepType *, diff --git a/Modules/Core/Common/include/itkTriangleCell.h b/Modules/Core/Common/include/itkTriangleCell.h index 24b6a787ddf..d4053cba45f 100644 --- a/Modules/Core/Common/include/itkTriangleCell.h +++ b/Modules/Core/Common/include/itkTriangleCell.h @@ -165,7 +165,7 @@ class ITK_TEMPLATE_EXPORT TriangleCell InterpolationWeightType *) override; /** Cell visitor interface. */ - itkCellVisitMacro(CellGeometryEnum::TRIANGLE_CELL); + itkCellVisitMacro(CellGeometryEnum::TRIANGLE_CELL) /** Compute Area to a TriangleCell given a PointsContainer. */ CoordRepType diff --git a/Modules/Core/Common/include/itkVertexCell.h b/Modules/Core/Common/include/itkVertexCell.h index 9b5f1d7b10a..488c1a295b7 100644 --- a/Modules/Core/Common/include/itkVertexCell.h +++ b/Modules/Core/Common/include/itkVertexCell.h @@ -125,7 +125,7 @@ class ITK_TEMPLATE_EXPORT VertexCell : public TCellInterface GetPointId(); /** Cell visitor interface */ - itkCellVisitMacro(CellGeometryEnum::VERTEX_CELL); + itkCellVisitMacro(CellGeometryEnum::VERTEX_CELL) /** Evaluate the position of a given point */ bool diff --git a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h index cfc3529afb1..a9f876abf3d 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h +++ b/Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h @@ -103,7 +103,7 @@ class ITK_TEMPLATE_EXPORT GeometricalQuadEdge : public QuadEdge inline itkQEDefineIteratorGeomMethodsMacro(InvDnext); /** QE macros. */ - itkQEAccessorsMacro(Superclass, Self, DualType); + itkQEAccessorsMacro(Superclass, Self, DualType) public: GeometricalQuadEdge(); diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h index d3e5fb6e8fc..561f0116b32 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h @@ -169,7 +169,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMesh : public Mesh