Skip to content

STYLE: clang-format AlignEscapedNewlines Left (for macro definitions) #2790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
N-Dekker merged 1 commit into from
Oct 13, 2021
Merged

STYLE: clang-format AlignEscapedNewlines Left (for macro definitions) #2790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: Right
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
# clang 9.0 AllowAllArgumentsOnNextLine: true
Expand Down
18 changes: 9 additions & 9 deletions Modules/Bridge/VTK/include/itkVTKImageImport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
#include "itkImageSource.h"
#include "itkImportImageContainer.h"

#define itkSetMacro2(name, type) \
virtual void Set##name(type _arg) \
{ \
itkDebugMacro("setting " #name " to " << _arg); \
if (this->m_##name != _arg) \
{ \
this->m_##name = _arg; \
this->Modified(); \
} \
#define itkSetMacro2(name, type) \
virtual void Set##name(type _arg) \
{ \
itkDebugMacro("setting " #name " to " << _arg); \
if (this->m_##name != _arg) \
{ \
this->m_##name = _arg; \
this->Modified(); \
} \
}

namespace itk
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/CMake/itkCheckHasFenvtStructMember.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main()
(void)sizeof(fenv.__cw);
#else
(void)fenv;
# error \
# error \
"Unknown fenv_t struct member test: Make sure to specify a compile definition of the form -DITK_CHECK_FENV_T_xxx"
#endif
return 0;
Expand Down
94 changes: 47 additions & 47 deletions Modules/Core/Common/include/itkCellInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,52 +29,52 @@
// Define a macro for CellInterface sub-classes to use
// to define the Accept and GetTopologyId virtuals used
// by the MultiVisitor class
#define itkCellVisitMacro(TopologyId) \
static constexpr CellGeometryEnum GetTopologyId() { return TopologyId; } \
virtual void Accept(CellIdentifier cellid, typename CellInterface<PixelType, CellTraits>::MultiVisitor * mv) \
override \
{ \
typename CellInterfaceVisitor<PixelType, CellTraits>::Pointer v = mv->GetVisitor(TopologyId); \
if (v) \
{ \
v->VisitFromCell(cellid, this); \
} \
#define itkCellVisitMacro(TopologyId) \
static constexpr CellGeometryEnum GetTopologyId() { return TopologyId; } \
virtual void Accept(CellIdentifier cellid, typename CellInterface<PixelType, CellTraits>::MultiVisitor * mv) \
override \
{ \
typename CellInterfaceVisitor<PixelType, CellTraits>::Pointer v = mv->GetVisitor(TopologyId); \
if (v) \
{ \
v->VisitFromCell(cellid, this); \
} \
}

// Define a macro for the common type alias required by the
// classes deriving form CellInterface (included).
#define itkCellCommonTypedefs(celltype) \
using Self = celltype; \
using ConstSelfAutoPointer = AutoPointer<const Self>; \
using SelfAutoPointer = AutoPointer<Self>; \
using RawPointer = Self *; \
#define itkCellCommonTypedefs(celltype) \
using Self = celltype; \
using ConstSelfAutoPointer = AutoPointer<const Self>; \
using SelfAutoPointer = AutoPointer<Self>; \
using RawPointer = Self *; \
using ConstRawPointer = const Self *

// Define a macro for the common type alias required by the
// classes deriving form CellInterface (excluded).
#define itkCellInheritedTypedefs(superclassArg) \
using Superclass = superclassArg; \
using typename Superclass::PixelType; \
using CellType = typename Superclass::CellType; \
using typename Superclass::CellAutoPointer; \
using typename Superclass::CellConstAutoPointer; \
using typename Superclass::CellRawPointer; \
using typename Superclass::CellConstRawPointer; \
using typename Superclass::CellTraits; \
using typename Superclass::CoordRepType; \
using typename Superclass::InterpolationWeightType; \
using typename Superclass::PointIdentifier; \
using typename Superclass::PointIdIterator; \
using typename Superclass::PointIdConstIterator; \
using typename Superclass::CellIdentifier; \
using typename Superclass::CellFeatureIdentifier; \
using CellFeatureCount = typename Superclass::CellFeatureIdentifier; \
using typename Superclass::PointType; \
using typename Superclass::VectorType; \
using typename Superclass::PointsContainer; \
using typename Superclass::UsingCellsContainer; \
using typename Superclass::ParametricCoordArrayType; \
using typename Superclass::ShapeFunctionsArrayType; \
#define itkCellInheritedTypedefs(superclassArg) \
using Superclass = superclassArg; \
using typename Superclass::PixelType; \
using CellType = typename Superclass::CellType; \
using typename Superclass::CellAutoPointer; \
using typename Superclass::CellConstAutoPointer; \
using typename Superclass::CellRawPointer; \
using typename Superclass::CellConstRawPointer; \
using typename Superclass::CellTraits; \
using typename Superclass::CoordRepType; \
using typename Superclass::InterpolationWeightType; \
using typename Superclass::PointIdentifier; \
using typename Superclass::PointIdIterator; \
using typename Superclass::PointIdConstIterator; \
using typename Superclass::CellIdentifier; \
using typename Superclass::CellFeatureIdentifier; \
using CellFeatureCount = typename Superclass::CellFeatureIdentifier; \
using typename Superclass::PointType; \
using typename Superclass::VectorType; \
using typename Superclass::PointsContainer; \
using typename Superclass::UsingCellsContainer; \
using typename Superclass::ParametricCoordArrayType; \
using typename Superclass::ShapeFunctionsArrayType; \
static constexpr unsigned int PointDimension = Superclass::PointDimension

namespace itk
Expand Down Expand Up @@ -537,15 +537,15 @@ class ITK_TEMPLATE_EXPORT CellTraitsInfo
using PointIdConstIterator = const PointIdentifier *;
};

#define itkMakeCellTraitsMacro \
CellTraitsInfo<Self::PointDimension, \
CoordRepType, \
InterpolationWeightType, \
PointIdentifier, \
CellIdentifier, \
CellFeatureIdentifier, \
PointType, \
PointsContainer, \
#define itkMakeCellTraitsMacro \
CellTraitsInfo<Self::PointDimension, \
CoordRepType, \
InterpolationWeightType, \
PointIdentifier, \
CellIdentifier, \
CellFeatureIdentifier, \
PointType, \
PointsContainer, \
UsingCellsContainer>
} // end namespace itk

Expand Down
46 changes: 23 additions & 23 deletions Modules/Core/Common/include/itkConceptChecking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
// Leave ()'s off the sizeof to force the caller to pass them in the
// concept argument of the itkConceptMacro. This is necessary because
// the argument may contain commas.
# define itkConceptConstraintsMacro() \
template <void (Constraints::*)()> \
struct Enforcer \
{}; \
using EnforcerInstantiation = Enforcer<&Constraints::constraints>; \
# define itkConceptConstraintsMacro() \
template <void (Constraints::*)()> \
struct Enforcer \
{}; \
using EnforcerInstantiation = Enforcer<&Constraints::constraints>; \
ITK_MACROEND_NOOP_STATEMENT
# define itkConceptMacro(name, concept) \
enum \
{ \
name = sizeof concept \
}; \
# define itkConceptMacro(name, concept) \
enum \
{ \
name = sizeof concept \
}; \
ITK_MACROEND_NOOP_STATEMENT

#elif defined(ITK_CONCEPT_IMPLEMENTATION_VTABLE)
Expand All @@ -76,32 +76,32 @@
* run-time overhead. The "vtable" approach was invented for this
* project by Brad King at Kitware.
*/
# define itkConceptConstraintsMacro() \
# define itkConceptConstraintsMacro() \
virtual void Enforcer() { &Constraints::constraints; }
# define itkConceptMacro(name, concept) \
enum \
{ \
name = sizeof concept \
# define itkConceptMacro(name, concept) \
enum \
{ \
name = sizeof concept \
}

#elif defined(ITK_CONCEPT_IMPLEMENTATION_CALL)

/** Not implemented. */
# define itkConceptConstraintsMacro()
# define itkConceptMacro(name, concept) \
enum \
{ \
name = 0 \
# define itkConceptMacro(name, concept) \
enum \
{ \
name = 0 \
}

#else

/** Disable concept checking. */
# define itkConceptConstraintsMacro()
# define itkConceptMacro(name, concept) \
enum \
{ \
name = 0 \
# define itkConceptMacro(name, concept) \
enum \
{ \
name = 0 \
}

#endif
Expand Down
Loading