Skip to content

Commit

Permalink
COMP: Remove ; from other itk macros
Browse files Browse the repository at this point in the history
  • Loading branch information
andrei-sandor committed May 30, 2024
1 parent c7d180e commit d752e78
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkHexahedronCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkLineCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkMath.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 12 additions & 12 deletions Modules/Core/Common/include/itkNumericTraits.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ class NumericTraits<char> : public std::numeric_limits<char>
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()
Expand Down Expand Up @@ -621,7 +621,7 @@ class NumericTraits<unsigned char> : public std::numeric_limits<unsigned char>
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()
Expand Down Expand Up @@ -724,7 +724,7 @@ class NumericTraits<short> : public std::numeric_limits<short>
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()
{
Expand Down Expand Up @@ -827,7 +827,7 @@ class NumericTraits<unsigned short> : public std::numeric_limits<unsigned short>
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()
{
Expand Down Expand Up @@ -929,7 +929,7 @@ class NumericTraits<int> : public std::numeric_limits<int>
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()
{
Expand Down Expand Up @@ -1154,7 +1154,7 @@ class NumericTraits<long> : public std::numeric_limits<long>
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()
{
Expand Down Expand Up @@ -1257,7 +1257,7 @@ class NumericTraits<unsigned long> : public std::numeric_limits<unsigned long>
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()
{
Expand Down Expand Up @@ -1361,7 +1361,7 @@ class NumericTraits<float> : public std::numeric_limits<float>
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()
{
Expand Down Expand Up @@ -1464,7 +1464,7 @@ class NumericTraits<double> : public std::numeric_limits<double>
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()
{
Expand Down Expand Up @@ -1575,7 +1575,7 @@ class NumericTraits<long double> : public std::numeric_limits<long double>
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()
{
Expand Down Expand Up @@ -1679,7 +1679,7 @@ class NumericTraits<long long> : public std::numeric_limits<long long>
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()
{
Expand Down Expand Up @@ -1782,7 +1782,7 @@ class NumericTraits<unsigned long long> : public std::numeric_limits<unsigned lo
static constexpr ValueType ITKCommon_EXPORT Zero = 0ULL;
static constexpr ValueType ITKCommon_EXPORT One = 1ULL;

itkNUMERIC_TRAITS_MIN_MAX_MACRO();
itkNUMERIC_TRAITS_MIN_MAX_MACRO()
static constexpr ValueType
NonpositiveMin()
{
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkPolyLineCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class ITK_TEMPLATE_EXPORT PolyLineCell : public TCellInterface
GetVertex(CellFeatureIdentifier, VertexAutoPointer &);

/** Visitor interface */
itkCellVisitMacro(CellGeometryEnum::POLYLINE_CELL);
itkCellVisitMacro(CellGeometryEnum::POLYLINE_CELL)

void
InitializePoints(PointIdentifier numberOfPoints)
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkPolygonCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class ITK_TEMPLATE_EXPORT PolygonCell : public TCellInterface
using EdgeInfoDQ = std::deque<EdgeInfo>;

/** Need to add POLYGON_CELL into CellInterface. */
itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL);
itkCellVisitMacro(CellGeometryEnum::POLYGON_CELL)

/** Implement the standard CellInterface. */
CellGeometryEnum
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkQuadraticEdgeCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkQuadraticTriangleCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkQuadrilateralCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkTetrahedronCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *,
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkTriangleCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/include/itkVertexCell.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/QuadEdgeMesh/include/itkGeometricalQuadEdge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMesh : public Mesh<TPixel, VDimension, TTraits

#if !defined(ITK_WRAPPING_PARSER)
/** FrontIterator definitions */
itkQEDefineFrontIteratorMethodsMacro(Self);
itkQEDefineFrontIteratorMethodsMacro(Self)
#endif

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class ITK_TEMPLATE_EXPORT MattesMutualInformationImageToImageMetric
};

#if !defined(ITK_WRAPPING_PARSER)
itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, MMIMetricPerThreadStruct, PaddedMMIMetricPerThreadStruct);
itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, MMIMetricPerThreadStruct, PaddedMMIMetricPerThreadStruct)
itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT, PaddedMMIMetricPerThreadStruct, AlignedMMIMetricPerThreadStruct);
// Due to a bug in older version of Visual Studio where std::vector resize
// uses a value instead of a const reference, this must be a pointer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class ITK_TEMPLATE_EXPORT ImageToImageMetricv4GetValueAndDerivativeThreaderBase
};
itkPadStruct(ITK_CACHE_LINE_ALIGNMENT,
GetValueAndDerivativePerThreadStruct,
PaddedGetValueAndDerivativePerThreadStruct);
PaddedGetValueAndDerivativePerThreadStruct)
itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
PaddedGetValueAndDerivativePerThreadStruct,
AlignedGetValueAndDerivativePerThreadStruct);
Expand Down

0 comments on commit d752e78

Please sign in to comment.