Skip to content

Commit

Permalink
clang-format: require semicolons on macros defined in sources
Browse files Browse the repository at this point in the history
Deferring requiring them in headers until remote modules are updated.
  • Loading branch information
kwrobot authored and mathstuf committed Nov 18, 2019
1 parent cc952a6 commit dda8b1c
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Filters/Core/vtkStaticCleanPolyData.cxx
Expand Up @@ -50,7 +50,7 @@ vtkStandardNewMacro(vtkStaticCleanPolyData);
vtkTemplate2MacroCase1CP(VTK_UNSIGNED_CHAR, unsigned char, call)
#define vtkTemplate2MacroCase1CP(type1N, type1, call) \
vtkTemplate2MacroCase2(type1N, type1, VTK_DOUBLE, double, call); \
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call);
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call)

namespace { //anonymous

Expand Down
4 changes: 2 additions & 2 deletions Filters/Core/vtkVectorDot.cxx
Expand Up @@ -29,10 +29,10 @@ vtkStandardNewMacro(vtkVectorDot);
// tandem with vtkTemplate2Macro found in vtkSetGet.h.
#define vtkTemplate2MacroFP(call) \
vtkTemplate2MacroCase1FP(VTK_DOUBLE, double, call); \
vtkTemplate2MacroCase1FP(VTK_FLOAT, float, call);
vtkTemplate2MacroCase1FP(VTK_FLOAT, float, call)
#define vtkTemplate2MacroCase1FP(type1N, type1, call) \
vtkTemplate2MacroCase2(type1N, type1, VTK_DOUBLE, double, call); \
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call);
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call)


// The heart of the algorithm plus interface to the SMP tools. Double templated
Expand Down
2 changes: 1 addition & 1 deletion Filters/General/vtkGradientFilter.cxx
Expand Up @@ -53,7 +53,7 @@ namespace
// have other data types for output arrays and this helps with reducing template expansion
#define vtkFloatingPointTemplateMacro(call) \
vtkTemplateMacroCase(VTK_DOUBLE, double, call); \
vtkTemplateMacroCase(VTK_FLOAT, float, call);
vtkTemplateMacroCase(VTK_FLOAT, float, call)

// helper function to replace the gradient of a vector
// with the vorticity/curl of that vector
Expand Down
4 changes: 2 additions & 2 deletions Filters/Modeling/vtkFitToHeightMapFilter.cxx
Expand Up @@ -34,10 +34,10 @@ vtkStandardNewMacro(vtkFitToHeightMapFilter);
// tandem with vtkTemplate2Macro found in vtkSetGet.h.
#define vtkTemplate2MacroFP(call) \
vtkTemplate2MacroCase1FP(VTK_DOUBLE, double, call); \
vtkTemplate2MacroCase1FP(VTK_FLOAT, float, call);
vtkTemplate2MacroCase1FP(VTK_FLOAT, float, call)
#define vtkTemplate2MacroCase1FP(type1N, type1, call) \
vtkTemplate2MacroCase2(type1N, type1, VTK_DOUBLE, double, call); \
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call);
vtkTemplate2MacroCase2(type1N, type1, VTK_FLOAT, float, call)

namespace {

Expand Down
2 changes: 1 addition & 1 deletion IO/XML/vtkXMLReader.cxx
Expand Up @@ -83,7 +83,7 @@ case type: \
"build. The IdType tag has been ignored."); \
} \
} \
break;
break

//-----------------------------------------------------------------------------
static void ReadStringVersion(const char* version, int& major, int& minor)
Expand Down
Expand Up @@ -44,7 +44,7 @@
#ifndef vtkFloatingPointTemplateMacro
#define vtkFloatingPointTemplateMacro(call) \
vtkTemplateMacroCase(VTK_DOUBLE, double, call); \
vtkTemplateMacroCase(VTK_FLOAT, float, call);
vtkTemplateMacroCase(VTK_FLOAT, float, call)
#endif

// Helper to compute range
Expand Down
2 changes: 1 addition & 1 deletion Rendering/ParallelLIC/vtkMPIPixelTT.cxx
Expand Up @@ -16,7 +16,7 @@

#define vtkMPIPixelTTMacro2(_ctype, _mpiEnum, _vtkEnum) \
MPI_Datatype vtkMPIPixelTT<_ctype>::MPIType = _mpiEnum; \
int vtkMPIPixelTT<_ctype>::VTKType = _vtkEnum;
int vtkMPIPixelTT<_ctype>::VTKType = _vtkEnum

vtkMPIPixelTTMacro2(void, MPI_BYTE, VTK_VOID);
vtkMPIPixelTTMacro2(char, MPI_CHAR, VTK_CHAR);
Expand Down

0 comments on commit dda8b1c

Please sign in to comment.