diff --git a/Filters/Core/vtkStaticCleanPolyData.cxx b/Filters/Core/vtkStaticCleanPolyData.cxx index 44ca45c33df..73123c097d3 100644 --- a/Filters/Core/vtkStaticCleanPolyData.cxx +++ b/Filters/Core/vtkStaticCleanPolyData.cxx @@ -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 diff --git a/Filters/Core/vtkVectorDot.cxx b/Filters/Core/vtkVectorDot.cxx index 88cb1fbbe4e..14f88e05d28 100644 --- a/Filters/Core/vtkVectorDot.cxx +++ b/Filters/Core/vtkVectorDot.cxx @@ -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 diff --git a/Filters/General/vtkGradientFilter.cxx b/Filters/General/vtkGradientFilter.cxx index 025f8be8b06..6655fb5d9c4 100644 --- a/Filters/General/vtkGradientFilter.cxx +++ b/Filters/General/vtkGradientFilter.cxx @@ -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 diff --git a/Filters/Modeling/vtkFitToHeightMapFilter.cxx b/Filters/Modeling/vtkFitToHeightMapFilter.cxx index 8653c47d7d5..31bda805bf9 100644 --- a/Filters/Modeling/vtkFitToHeightMapFilter.cxx +++ b/Filters/Modeling/vtkFitToHeightMapFilter.cxx @@ -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 { diff --git a/IO/XML/vtkXMLReader.cxx b/IO/XML/vtkXMLReader.cxx index c2c545fab0a..e8b8799b3df 100644 --- a/IO/XML/vtkXMLReader.cxx +++ b/IO/XML/vtkXMLReader.cxx @@ -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) diff --git a/Rendering/LICOpenGL2/Testing/Cxx/vtkSurfaceLICTestDriver.cxx b/Rendering/LICOpenGL2/Testing/Cxx/vtkSurfaceLICTestDriver.cxx index a37c4d55895..68fe30d6fe2 100644 --- a/Rendering/LICOpenGL2/Testing/Cxx/vtkSurfaceLICTestDriver.cxx +++ b/Rendering/LICOpenGL2/Testing/Cxx/vtkSurfaceLICTestDriver.cxx @@ -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 diff --git a/Rendering/ParallelLIC/vtkMPIPixelTT.cxx b/Rendering/ParallelLIC/vtkMPIPixelTT.cxx index 1449ea76212..898aaf86110 100644 --- a/Rendering/ParallelLIC/vtkMPIPixelTT.cxx +++ b/Rendering/ParallelLIC/vtkMPIPixelTT.cxx @@ -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);