VTK-m filters now have a consistent set of header guards

vtkm/filter/CellAverage.cxx

@@ -10,7 +10,6 @@
 #define vtkm_filter_CellAverage_cxx
 
 #include <vtkm/filter/CellAverage.h>
-#include <vtkm/filter/CellAverage.hxx>
 
 namespace vtkm
 {

vtkm/filter/CellAverage.h

@@ -47,4 +47,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(CellAverage);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/CellAverage.hxx>
+
 #endif // vtk_m_filter_CellAverage_h

vtkm/filter/CellAverage.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_CellAverage_hxx
+#define vtk_m_filter_CellAverage_hxx
+
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -47,3 +50,5 @@ inline VTKM_CONT vtkm::cont::DataSet CellAverage::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/CellMeasures.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_CellMeasures_hxx
+#define vtk_m_filter_CellMeasures_hxx
+
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -56,3 +59,5 @@ inline VTKM_CONT vtkm::cont::DataSet CellMeasures<IntegrationType>::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/CleanGrid.h

@@ -146,4 +146,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(CleanGrid);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/CleanGrid.hxx>
+
 #endif //vtk_m_filter_CleanGrid_h

vtkm/filter/CleanGrid.hxx

@@ -8,7 +8,8 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
-#include <vtkm/filter/CleanGrid.h>
+#ifndef vtkm_m_filter_CleanGrid_hxx
+#define vtkm_m_filter_CleanGrid_hxx
 
 #include <vtkm/worklet/CellDeepCopy.h>
 #include <vtkm/worklet/RemoveUnusedPoints.h>
@@ -71,3 +72,5 @@ inline VTKM_CONT vtkm::cont::DataSet CleanGrid::DoExecute(const vtkm::cont::Data
 }
 }
 }
+
+#endif

vtkm/filter/ClipWithField.cxx

@@ -10,7 +10,6 @@
 #define vtkm_filter_Clip_cxx
 
 #include <vtkm/filter/ClipWithField.h>
-#include <vtkm/filter/ClipWithField.hxx>
 
 namespace vtkm
 {

vtkm/filter/ClipWithField.h

@@ -86,4 +86,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(ClipWithField);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/ClipWithField.hxx>
+
 #endif // vtk_m_filter_ClipWithField_h

vtkm/filter/ClipWithField.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ClipWithField_hxx
+#define vtk_m_filter_ClipWithField_hxx
+
 #include <vtkm/cont/ArrayHandlePermutation.h>
 #include <vtkm/cont/CellSetPermutation.h>
 #include <vtkm/cont/CoordinateSystem.h>
@@ -52,3 +55,5 @@ inline VTKM_CONT vtkm::cont::DataSet ClipWithField::DoExecute(
 }
 }
 } // end namespace vtkm::filter
+
+#endif

vtkm/filter/ClipWithImplicitFunction.cxx

@@ -10,7 +10,6 @@
 //============================================================================
 #define vtkm_filter_ClipWithImplicitFunction_cxx
 #include <vtkm/filter/ClipWithImplicitFunction.h>
-#include <vtkm/filter/ClipWithImplicitFunction.hxx>
 
 namespace vtkm
 {

vtkm/filter/ClipWithImplicitFunction.h

@@ -84,4 +84,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(ClipWithImplicitFunction);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/ClipWithImplicitFunction.hxx>
+
 #endif // vtk_m_filter_ClipWithImplicitFunction_h

vtkm/filter/ClipWithImplicitFunction.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ClipWithImplicitFunction_hxx
+#define vtk_m_filter_ClipWithImplicitFunction_hxx
+
 #include <vtkm/cont/ArrayHandlePermutation.h>
 #include <vtkm/cont/CellSetPermutation.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -44,3 +47,5 @@ inline vtkm::cont::DataSet ClipWithImplicitFunction::DoExecute(
 }
 }
 } // end namespace vtkm::filter
+
+#endif

vtkm/filter/Contour.cxx

@@ -9,7 +9,6 @@
 //============================================================================
 #define vtkm_filter_Contour_cxx
 #include <vtkm/filter/Contour.h>
-#include <vtkm/filter/Contour.hxx>
 
 namespace vtkm
 {

vtkm/filter/Contour.h

@@ -156,4 +156,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(Contour);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/Contour.hxx>
+
 #endif // vtk_m_filter_Contour_h

vtkm/filter/Contour.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Contour_hxx
+#define vtk_m_filter_Contour_hxx
 
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/CellSetSingleType.h>
@@ -152,3 +154,5 @@ inline VTKM_CONT vtkm::cont::DataSet Contour::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/ContourTreeUniform.hxx

@@ -54,6 +54,10 @@
 //  Proceedings of the IEEE Symposium on Large Data Analysis and Visualization
 //  (LDAV), October 2016, Baltimore, Maryland.
 
+#ifndef vtk_m_filter_ContourTreeUniform_hxx
+#define vtk_m_filter_ContourTreeUniform_hxx
+
+
 #include <vtkm/cont/ErrorFilterExecution.h>
 
 #include <vtkm/worklet/ContourTreeUniform.h>
@@ -137,3 +141,5 @@ vtkm::cont::DataSet ContourTreeMesh3D::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/ContourTreeUniformAugmented.hxx

@@ -50,6 +50,9 @@
 //  Oliver Ruebel (LBNL)
 //==============================================================================
 
+#ifndef vtk_m_filter_ContourTreeUniformAugmented_hxx
+#define vtk_m_filter_ContourTreeUniformAugmented_hxx
+
 #include <vtkm/cont/ErrorBadValue.h>
 #include <vtkm/cont/Timer.h>
 #include <vtkm/filter/ContourTreeUniformAugmented.h>
@@ -953,3 +956,5 @@ inline VTKM_CONT void ContourTreePPP2::PostExecute(
 
 } // namespace filter
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/CoordinateSystemTransform.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_CoordianteSystemTransform_hxx
+#define vtk_m_filter_CoordianteSystemTransform_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -54,3 +57,5 @@ inline VTKM_CONT vtkm::cont::DataSet SphericalCoordinateTransform::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/CrossProduct.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_CrossProduct_hxx
+#define vtk_m_filter_CrossProduct_hxx
+
 #include <vtkm/cont/ArrayHandleCast.h>
 
 #include <vtkm/worklet/DispatcherMapField.h>
@@ -55,3 +58,5 @@ inline VTKM_CONT vtkm::cont::DataSet CrossProduct::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/DotProduct.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_DotProduct_hxx
+#define vtk_m_filter_DotProduct_hxx
+
 #include <vtkm/cont/ArrayHandleCast.h>
 
 namespace vtkm
@@ -53,3 +56,5 @@ inline VTKM_CONT vtkm::cont::DataSet DotProduct::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/Entropy.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Entropy_hxx
+#define vtk_m_filter_Entropy_hxx
+
 #include <vtkm/worklet/FieldEntropy.h>
 
 namespace vtkm
@@ -43,3 +46,5 @@ inline VTKM_CONT vtkm::cont::DataSet Entropy::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/ExternalFaces.cxx

@@ -10,7 +10,6 @@
 //============================================================================
 #define vtkm_filter_ExternalFaces_cxx
 #include <vtkm/filter/ExternalFaces.h>
-#include <vtkm/filter/ExternalFaces.hxx>
 
 namespace vtkm
 {

vtkm/filter/ExternalFaces.h

@@ -106,4 +106,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(ExternalFaces);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/ExternalFaces.hxx>
+
 #endif // vtk_m_filter_ExternalFaces_h

vtkm/filter/ExternalFaces.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ExternalFaces_hxx
+#define vtk_m_filter_ExternalFaces_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -41,3 +44,5 @@ inline VTKM_CONT vtkm::cont::DataSet ExternalFaces::DoExecute(
 }
 }
 }
+
+#endif

vtkm/filter/ExtractGeometry.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ExtractGeometry_hxx
+#define vtk_m_filter_ExtractGeometry_hxx
+
 #include <vtkm/cont/ArrayHandlePermutation.h>
 #include <vtkm/cont/CellSetPermutation.h>
 #include <vtkm/cont/CoordinateSystem.h>
@@ -128,3 +131,5 @@ inline VTKM_CONT bool ExtractGeometry::DoMapField(
 }
 }
 }
+
+#endif

vtkm/filter/ExtractPoints.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ExtractPoints_hxx
+#define vtk_m_filter_ExtractPoints_hxx
+
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/DynamicCellSet.h>
 
@@ -88,3 +91,5 @@ inline VTKM_CONT bool ExtractPoints::DoMapField(
 }
 }
 }
+
+#endif

vtkm/filter/ExtractStructured.cxx

@@ -9,7 +9,6 @@
 //============================================================================
 #define vtkm_filter_ExtractStructured_cxx
 #include <vtkm/filter/ExtractStructured.h>
-#include <vtkm/filter/ExtractStructured.hxx>
 
 namespace vtkm
 {

vtkm/filter/ExtractStructured.h

@@ -128,5 +128,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(ExtractStructured);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/ExtractStructured.hxx>
 
 #endif // vtk_m_filter_ExtractStructured_h

vtkm/filter/ExtractStructured.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ExtractStructured_hxx
+#define vtk_m_filter_ExtractStructured_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -37,3 +40,5 @@ inline VTKM_CONT vtkm::cont::DataSet ExtractStructured::DoExecute(
 }
 }
 }
+
+#endif

vtkm/filter/FieldToColors.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_FieldToColors_hxx
+#define vtk_m_filter_FieldToColors_hxx
+
 #include <vtkm/VecTraits.h>
 #include <vtkm/cont/ColorTable.hxx>
 #include <vtkm/cont/ErrorFilterExecution.h>
@@ -257,3 +260,5 @@ inline VTKM_CONT vtkm::cont::DataSet FieldToColors::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/GhostCellClassify.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_GhostCellClassify_hxx
+#define vtk_m_filter_GhostCellClassify_hxx
 
 #include <vtkm/CellClassification.h>
 #include <vtkm/RangeId.h>
@@ -154,3 +156,4 @@ inline VTKM_CONT vtkm::cont::DataSet GhostCellClassify::DoExecute(const vtkm::co
 }
 }
 }
+#endif

vtkm/filter/Gradient.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Gradient_hxx
+#define vtk_m_filter_Gradient_hxx
+
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -112,3 +115,5 @@ inline vtkm::cont::DataSet Gradient::DoExecute(
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/Histogram.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Histogram_hxx
+#define vtk_m_filter_Histogram_hxx
+
 #include <vtkm/worklet/FieldHistogram.h>
 
 #include <vtkm/cont/Algorithm.h>
@@ -249,3 +252,5 @@ inline VTKM_CONT void Histogram::PostExecute(const vtkm::cont::PartitionedDataSe
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/ImageConnectivity.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_ImageConnectivity_hxx
+#define vtk_m_filter_ImageConnectivity_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -40,3 +43,5 @@ inline VTKM_CONT vtkm::cont::DataSet ImageConnectivity::DoExecute(
 }
 }
 }
+
+#endif

vtkm/filter/Lagrangian.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Lagrangian_hxx
+#define vtk_m_filter_Lagrangian_hxx
+
 #include <vtkm/Types.h>
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandle.h>
@@ -329,3 +332,5 @@ inline VTKM_CONT bool Lagrangian::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+
+#endif

vtkm/filter/LagrangianStructures.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_LagrangianStructures_hxx
+#define vtk_m_filter_LagrangianStructures_hxx
 
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
@@ -144,3 +146,4 @@ inline VTKM_CONT bool LagrangianStructures::DoMapField(
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/Mask.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Mask_hxx
+#define vtk_m_filter_Mask_hxx
 
 namespace
 {
@@ -90,3 +92,4 @@ inline VTKM_CONT bool Mask::DoMapField(vtkm::cont::DataSet& result,
 }
 }
 }
+#endif

vtkm/filter/MaskPoints.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_MaskPoints_hxx
+#define vtk_m_filter_MaskPoints_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -80,3 +83,4 @@ inline VTKM_CONT bool MaskPoints::DoMapField(vtkm::cont::DataSet& result,
 }
 }
 }
+#endif

vtkm/filter/MeshQuality.hxx

@@ -17,6 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //=========================================================================
+#ifndef vtk_m_filter_MeshQuality_hxx
+#define vtk_m_filter_MeshQuality_hxx
 
 #include <vtkm/cont/Algorithm.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -103,3 +105,4 @@ inline VTKM_CONT vtkm::cont::DataSet MeshQuality::DoExecute(
 
 } // namespace filter
 } // namespace vtkm
+#endif

vtkm/filter/NDEntropy.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_NDEntropy_hxx
+#define vtk_m_filter_NDEntropy_hxx
 
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/worklet/NDimsEntropy.h>
@@ -65,3 +67,4 @@ inline VTKM_CONT bool NDEntropy::DoMapField(vtkm::cont::DataSet&,
 }
 }
 }
+#endif

vtkm/filter/NDHistogram.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_NDHistogram_hxx
+#define vtk_m_filter_NDHistogram_hxx
 
 #include <vector>
 #include <vtkm/cont/DataSet.h>
@@ -86,3 +88,4 @@ inline VTKM_CONT bool NDHistogram::DoMapField(vtkm::cont::DataSet&,
 }
 }
 }
+#endif

vtkm/filter/Pathline.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Pathline_hxx
+#define vtk_m_filter_Pathline_hxx
+
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
@@ -97,3 +100,4 @@ inline VTKM_CONT bool Pathline::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/PointAverage.cxx

@@ -10,7 +10,6 @@
 #define vtkm_filter_PointAverage_cxx
 
 #include <vtkm/filter/PointAverage.h>
-#include <vtkm/filter/PointAverage.hxx>
 
 namespace vtkm
 {

vtkm/filter/PointAverage.h

@@ -46,4 +46,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(PointAverage);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/PointAverage.hxx>
+
 #endif // vtk_m_filter_PointAverage_h

vtkm/filter/PointAverage.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_PointAverage_hxx
+#define vtk_m_filter_PointAverage_hxx
+
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -47,3 +50,4 @@ inline VTKM_CONT vtkm::cont::DataSet PointAverage::DoExecute(
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/PointElevation.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_PointElevation_hxx
+#define vtk_m_filter_PointElevation_hxx
+
 namespace vtkm
 {
 namespace filter
@@ -58,3 +61,4 @@ inline VTKM_CONT vtkm::cont::DataSet PointElevation::DoExecute(
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/Probe.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Probe_hxx
+#define vtk_m_filter_Probe_hxx
 
 namespace vtkm
 {
@@ -65,3 +67,4 @@ VTKM_CONT inline bool Probe::DoMapField(vtkm::cont::DataSet& result,
 }
 }
 } // vtkm::filter
+#endif

vtkm/filter/SplitSharpEdges.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_SplitSharpEdges_hxx
+#define vtk_m_filter_SplitSharpEdges_hxx
+
 #include <vtkm/cont/ArrayHandlePermutation.h>
 #include <vtkm/cont/CellSetExplicit.h>
 #include <vtkm/cont/CoordinateSystem.h>
@@ -79,3 +82,4 @@ inline VTKM_CONT bool SplitSharpEdges::DoMapField(
 }
 }
 }
+#endif

vtkm/filter/StreamSurface.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_StreamSurface_hxx
+#define vtk_m_filter_StreamSurface_hxx
+
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
 #include <vtkm/cont/ErrorFilterExecution.h>
@@ -86,3 +89,4 @@ inline VTKM_CONT bool StreamSurface::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/Streamline.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Streamline_hxx
+#define vtk_m_filter_Streamline_hxx
 
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
@@ -88,3 +90,4 @@ inline VTKM_CONT bool Streamline::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/SurfaceNormals.hxx

@@ -7,8 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
-
-#include <vtkm/filter/SurfaceNormals.h>
+#ifndef vtk_m_filter_SurfaceNormals_hxx
+#define vtk_m_filter_SurfaceNormals_hxx
 
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -151,3 +151,4 @@ inline vtkm::cont::DataSet SurfaceNormals::DoExecute(
 }
 }
 } // vtkm::filter
+#endif

vtkm/filter/Tetrahedralize.hxx

@@ -8,6 +8,9 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
+#ifndef vtk_m_filter_Tetrahedralize_hxx
+#define vtk_m_filter_Tetrahedralize_hxx
+
 namespace
 {
 struct DeduceCellSet
@@ -81,3 +84,4 @@ inline VTKM_CONT bool Tetrahedralize::DoMapField(
 }
 }
 }
+#endif

vtkm/filter/Threshold.cxx

@@ -9,7 +9,6 @@
 //============================================================================
 #define vtkm_filter_Threshold_cxx
 #include <vtkm/filter/Threshold.h>
-#include <vtkm/filter/Threshold.hxx>
 
 namespace vtkm
 {

vtkm/filter/Threshold.h

@@ -89,4 +89,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(Threshold);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/Threshold.hxx>
+
 #endif // vtk_m_filter_Threshold_h

vtkm/filter/Threshold.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Threshold_hxx
+#define vtk_m_filter_Threshold_hxx
 
 #include <vtkm/cont/ArrayHandleCounting.h>
 #include <vtkm/cont/ArrayHandlePermutation.h>
@@ -66,3 +68,4 @@ inline VTKM_CONT vtkm::cont::DataSet Threshold::DoExecute(
 }
 }
 }
+#endif

vtkm/filter/ThresholdPoints.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ThresholdPoints_hxx
+#define vtk_m_filter_ThresholdPoints_hxx
 
 #include <vtkm/cont/ErrorFilterExecution.h>
 
@@ -211,3 +213,4 @@ inline VTKM_CONT bool ThresholdPoints::DoMapField(
 }
 }
 }
+#endif

vtkm/filter/Triangulate.hxx

@@ -7,8 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
-
-#include <vtkm/worklet/DispatcherMapField.h>
+#ifndef vtk_m_filter_Triangulate_hxx
+#define vtk_m_filter_Triangulate_hxx
 
 namespace
 {
@@ -107,3 +107,4 @@ inline VTKM_CONT bool Triangulate::DoMapField(vtkm::cont::DataSet& result,
 }
 }
 }
+#endif

vtkm/filter/Tube.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_Tube_hxx
+#define vtk_m_filter_Tube_hxx
 
 #include <vtkm/cont/ArrayCopy.h>
 #include <vtkm/cont/ArrayHandleIndex.h>
@@ -70,3 +72,4 @@ inline VTKM_CONT bool Tube::DoMapField(vtkm::cont::DataSet& result,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/VectorMagnitude.cxx

@@ -10,7 +10,6 @@
 #define vtkm_filter_VectorMagnitude_cxx
 
 #include <vtkm/filter/VectorMagnitude.h>
-#include <vtkm/filter/VectorMagnitude.hxx>
 
 namespace vtkm
 {

vtkm/filter/VectorMagnitude.h

@@ -45,4 +45,6 @@ VTKM_FILTER_EXPORT_EXECUTE_METHOD(VectorMagnitude);
 }
 } // namespace vtkm::filter
 
+#include <vtkm/filter/VectorMagnitude.hxx>
+
 #endif // vtk_m_filter_VectorMagnitude_h

vtkm/filter/VectorMagnitude.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_VectorMagnitude_hxx
+#define vtk_m_filter_VectorMagnitude_hxx
 
 #include <vtkm/Math.h>
 
@@ -32,3 +34,4 @@ inline VTKM_CONT vtkm::cont::DataSet VectorMagnitude::DoExecute(
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/VertexClustering.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_VertexClustering_hxx
+#define vtk_m_filter_VertexClustering_hxx
 
 namespace vtkm
 {
@@ -70,3 +72,4 @@ inline VTKM_CONT bool VertexClustering::DoMapField(
 }
 }
 }
+#endif

vtkm/filter/WarpScalar.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_WarpScalar_hxx
+#define vtk_m_filter_WarpScalar_hxx
 
 namespace vtkm
 {
@@ -50,3 +52,4 @@ inline VTKM_CONT vtkm::cont::DataSet WarpScalar::DoExecute(
 }
 }
 }
+#endif

vtkm/filter/WarpVector.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_WarpVector_hxx
+#define vtk_m_filter_WarpVector_hxx
 
 namespace vtkm
 {
@@ -45,3 +47,4 @@ inline VTKM_CONT vtkm::cont::DataSet WarpVector::DoExecute(
 }
 }
 }
+#endif

vtkm/filter/ZFPCompressor1D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPCompressor1D_hxx
+#define vtk_m_filter_ZFPCompressor1D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -66,3 +68,4 @@ inline VTKM_CONT bool ZFPCompressor1D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/ZFPCompressor2D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPCompressor2D_hxx
+#define vtk_m_filter_ZFPCompressor2D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -72,3 +74,4 @@ inline VTKM_CONT bool ZFPCompressor2D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/ZFPCompressor3D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPCompressor3D_hxx
+#define vtk_m_filter_ZFPCompressor3D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -72,3 +74,4 @@ inline VTKM_CONT bool ZFPCompressor3D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/ZFPDecompressor1D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPDecompressor1D_hxx
+#define vtk_m_filter_ZFPDecompressor1D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -63,3 +65,4 @@ inline VTKM_CONT bool ZFPDecompressor1D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/ZFPDecompressor2D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPDecompressor2D_hxx
+#define vtk_m_filter_ZFPDecompressor2D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -68,3 +70,4 @@ inline VTKM_CONT bool ZFPDecompressor2D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif

vtkm/filter/ZFPDecompressor3D.hxx

@@ -7,6 +7,8 @@
 //  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
+#ifndef vtk_m_filter_ZFPDecompressor3D_hxx
+#define vtk_m_filter_ZFPDecompressor3D_hxx
 
 #include <vtkm/cont/CellSetStructured.h>
 #include <vtkm/cont/DynamicCellSet.h>
@@ -67,3 +69,4 @@ inline VTKM_CONT bool ZFPDecompressor3D::DoMapField(vtkm::cont::DataSet&,
 }
 }
 } // namespace vtkm::filter
+#endif