From efbde1d54bd9e60816946fa0e0e727a2d34cf816 Mon Sep 17 00:00:00 2001 From: Kitware Robot Date: Thu, 18 May 2017 10:51:24 -0400 Subject: [PATCH] clang-format: sort include directives --- CMake/VTKmDetectCUDAVersion.cu | 2 +- examples/clipping/Clipping.cxx | 2 +- examples/demo/Demo.cxx | 6 ++-- examples/multi_backend/MultiBackend.cxx | 6 ++-- examples/rendering/Rendering.cxx | 2 +- examples/streamline/StreamLineUniformGrid.cxx | 6 ++-- .../tetrahedra/TetrahedralizeExplicitGrid.cxx | 4 +-- .../tetrahedra/TetrahedralizeUniformGrid.cxx | 4 +-- .../tetrahedra/TriangulateExplicitGrid.cxx | 2 +- .../tetrahedra/TriangulateUniformGrid.cxx | 4 +-- examples/unified_memory/UnifiedMemory.cu | 2 +- vtkm/BinaryOperators.h | 2 +- vtkm/Math.h | 4 +-- vtkm/Matrix.h | 2 +- vtkm/StaticAssert.h | 2 +- vtkm/VecFromPortal.h | 2 +- vtkm/VecFromPortalPermute.h | 2 +- vtkm/VecRectilinearPointCoordinates.h | 2 +- vtkm/VecVariable.h | 2 +- vtkm/VectorAnalysis.h | 2 +- vtkm/benchmarking/BenchmarkDeviceAdapter.cxx | 6 ++-- .../benchmarking/BenchmarkFieldAlgorithms.cxx | 6 ++-- .../BenchmarkTopologyAlgorithms.cxx | 6 ++-- vtkm/benchmarking/Benchmarker.h | 2 +- vtkm/cont/ArrayHandle.h | 2 +- vtkm/cont/ArrayHandleDiscard.h | 2 +- .../cont/ArrayHandleUniformPointCoordinates.h | 2 +- vtkm/cont/ArrayHandleZip.h | 2 +- vtkm/cont/CellSet.h | 4 +-- vtkm/cont/CellSetExplicit.h | 10 +++--- vtkm/cont/CellSetStructured.h | 4 +-- vtkm/cont/CoordinateSystem.h | 4 +-- vtkm/cont/DataSet.h | 2 +- vtkm/cont/DeviceAdapter.h | 4 ++- vtkm/cont/DeviceAdapterListTag.h | 2 +- vtkm/cont/Field.h | 2 +- vtkm/cont/ImplicitFunction.h | 2 +- vtkm/cont/ImplicitFunction.hxx | 2 +- vtkm/cont/RuntimeDeviceTracker.cxx | 2 +- vtkm/cont/StorageBasic.h | 2 +- .../testing/UnitTestTransportCellSetIn.cxx | 2 +- vtkm/cont/cuda/ArrayHandleCuda.h | 2 +- vtkm/cont/cuda/ChooseCudaDevice.h | 2 +- .../cuda/internal/ArrayManagerExecutionCuda.h | 2 +- .../ArrayManagerExecutionThrustDevice.h | 4 +-- .../internal/DeviceAdapterAlgorithmCuda.h | 2 +- .../internal/DeviceAdapterAlgorithmThrust.h | 10 +++--- vtkm/cont/cuda/internal/MakeThrustIterator.h | 6 ++-- .../cuda/internal/ThrustExceptionHandler.h | 2 +- .../cuda/testing/UnitTestCudaArrayHandle.cu | 4 +-- .../testing/UnitTestCudaArrayHandleFancy.cu | 2 +- .../testing/UnitTestCudaDataSetExplicit.cu | 2 +- .../testing/UnitTestCudaDataSetSingleType.cu | 2 +- .../cuda/testing/UnitTestCudaDeviceAdapter.cu | 2 +- .../internal/DeviceAdapterAlgorithmGeneral.h | 2 +- .../internal/DeviceAdapterDefaultSelection.h | 2 +- vtkm/cont/internal/DeviceAdapterTag.h | 2 +- vtkm/cont/internal/FunctorsGeneral.h | 2 +- vtkm/cont/internal/IteratorFromArrayPortal.h | 2 +- .../internal/SimplePolymorphicContainer.h | 2 +- .../UnitTestArrayPortalFromIterators.cxx | 2 +- vtkm/cont/serial/DeviceAdapterSerial.h | 3 ++ .../internal/VirtualObjectTransferSerial.h | 2 +- vtkm/cont/tbb/internal/FunctorsTBB.h | 4 +-- .../tbb/internal/VirtualObjectTransferTBB.h | 2 +- vtkm/cont/tbb/internal/parallel_sort.h | 4 +-- vtkm/cont/testing/ExplicitTestData.h | 2 +- vtkm/cont/testing/TestingArrayHandles.h | 2 +- vtkm/cont/testing/TestingDataSetExplicit.h | 2 +- vtkm/cont/testing/TestingDataSetSingleType.h | 4 +-- vtkm/cont/testing/TestingDeviceAdapter.h | 6 ++-- vtkm/cont/testing/TestingFancyArrayHandles.h | 2 +- vtkm/cont/testing/TestingVirtualObjectCache.h | 4 +-- .../UnitTestArrayHandleCartesianProduct.cxx | 2 +- .../UnitTestArrayHandleCompositeVector.cxx | 2 +- .../UnitTestArrayHandleConcatenate.cxx | 2 +- .../testing/UnitTestArrayHandleReverse.cxx | 2 +- .../UnitTestDataSetBuilderExplicit.cxx | 4 +-- .../testing/UnitTestDataSetBuilderUniform.cxx | 2 +- .../testing/UnitTestDataSetPermutation.cxx | 6 ++-- .../testing/UnitTestDataSetRectilinear.cxx | 4 +-- vtkm/cont/testing/UnitTestDataSetUniform.cxx | 2 +- .../UnitTestDeviceAdapterAlgorithmGeneral.cxx | 2 +- .../UnitTestRuntimeDeviceInformation.cxx | 2 +- vtkm/cont/testing/UnitTestStorageBasic.cxx | 8 ++--- vtkm/cont/testing/UnitTestTryExecute.cxx | 2 +- vtkm/exec/AtomicArray.h | 2 +- vtkm/exec/CellDerivative.h | 2 +- vtkm/exec/CellEdge.h | 2 +- vtkm/exec/CellFace.h | 2 +- vtkm/exec/ExecutionWholeArray.h | 2 +- vtkm/exec/ParametricCoordinates.h | 2 +- vtkm/exec/arg/CellShape.h | 2 +- vtkm/exec/arg/FetchTagArrayTopologyMapIn.h | 2 +- vtkm/exec/arg/FromCount.h | 2 +- vtkm/exec/arg/FromIndices.h | 2 +- vtkm/exec/arg/InputIndex.h | 2 +- vtkm/exec/arg/OutputIndex.h | 2 +- vtkm/exec/arg/ThreadIndices.h | 2 +- vtkm/exec/arg/ValueCount.h | 2 +- vtkm/exec/arg/VisitIndex.h | 2 +- vtkm/exec/arg/WorkIndex.h | 2 +- .../cuda/internal/IteratorFromArrayPortal.h | 2 +- vtkm/exec/cuda/internal/WrappedOperators.h | 4 +-- .../testing/UnitTestTextureMemorySupport.cu | 2 +- .../testing/UnitTestErrorMessageBuffer.cxx | 2 +- .../internal/testing/UnitTestTaskSingular.cxx | 2 +- vtkm/exec/testing/UnitTestCellInterpolate.cxx | 2 +- vtkm/filter/ClipWithImplicitFunction.hxx | 2 +- vtkm/filter/ExternalFaces.h | 2 +- vtkm/filter/ExtractPoints.h | 2 +- vtkm/filter/ExtractPoints.hxx | 2 +- vtkm/filter/FieldMetadata.h | 2 +- vtkm/filter/FilterDataSet.h | 2 +- vtkm/filter/FilterDataSetWithField.h | 2 +- vtkm/filter/FilterField.h | 2 +- vtkm/filter/MarchingCubes.hxx | 2 +- vtkm/filter/Mask.h | 2 +- vtkm/filter/MaskPoints.h | 2 +- vtkm/filter/Threshold.hxx | 2 +- vtkm/filter/ThresholdPoints.h | 2 +- .../internal/ResolveFieldTypeAndExecute.h | 2 +- vtkm/filter/internal/ResolveFieldTypeAndMap.h | 2 +- .../testing/UnitTestCellAverageFilter.cxx | 4 +-- .../testing/UnitTestClipWithFieldFilter.cxx | 2 +- ...UnitTestClipWithImplicitFunctionFilter.cxx | 2 +- vtkm/filter/testing/UnitTestFieldMetadata.cxx | 4 +-- vtkm/filter/testing/UnitTestGradient.cxx | 2 +- .../testing/UnitTestPointAverageFilter.cxx | 4 +-- .../testing/UnitTestPointElevationFilter.cxx | 2 +- .../testing/UnitTestVectorMagnitudeFilter.cxx | 2 +- vtkm/internal/ArrayPortalValueReference.h | 2 +- vtkm/internal/FunctionInterface.h | 2 +- vtkm/interop/BufferState.h | 2 +- vtkm/interop/cuda/internal/TransferToOpenGL.h | 2 +- vtkm/interop/internal/BufferTypePicker.h | 2 +- vtkm/interop/internal/OpenGLHeaders.h | 3 ++ vtkm/interop/internal/TransferToOpenGL.h | 4 +-- .../testing/UnitTestBufferTypePicker.cxx | 2 +- .../testing/UnitTestOpenGLHeaders.cxx | 2 +- vtkm/interop/testing/UnitTestTransferEGL.cxx | 2 +- vtkm/interop/testing/UnitTestTransferGLUT.cxx | 2 +- .../testing/UnitTestTransferOSMesa.cxx | 2 +- vtkm/io/reader/VTKDataSetReader.h | 4 +-- vtkm/io/reader/VTKDataSetReaderBase.h | 2 +- .../testing/UnitTestVTKDataSetReader.cxx | 2 +- vtkm/io/writer/VTKDataSetWriter.h | 2 +- .../testing/UnitTestVTKDataSetWriter.cxx | 2 +- vtkm/rendering/AxisAnnotation2D.h | 2 +- vtkm/rendering/AxisAnnotation3D.h | 4 +-- vtkm/rendering/Camera.h | 2 +- vtkm/rendering/Canvas.cxx | 2 +- vtkm/rendering/CanvasGL.cxx | 2 +- vtkm/rendering/CanvasRayTracer.cxx | 2 +- vtkm/rendering/ColorTable.h | 2 +- vtkm/rendering/MapperGL.cxx | 2 +- vtkm/rendering/MapperGL.h | 2 +- vtkm/rendering/MapperRayTracer.cxx | 2 +- vtkm/rendering/MapperRayTracer.h | 2 +- vtkm/rendering/View1D.cxx | 2 +- vtkm/rendering/View1D.h | 2 +- vtkm/rendering/internal/OpenGLHeaders.h | 2 +- .../raytracing/BoundingVolumeHierarchy.h | 14 ++++---- vtkm/rendering/raytracing/RayTracer.h | 4 +-- .../rendering/raytracing/RayTracingTypeDefs.h | 2 +- .../raytracing/VolumeRendererStructured.h | 6 ++-- vtkm/rendering/testing/RenderTest.h | 2 +- .../testing/UnitTestMapperRayTracer.cxx | 4 +-- .../testing/UnitTestMapperVolume.cxx | 4 +-- .../testing/egl/UnitTestMapperEGL.cxx | 6 ++-- .../testing/glfw/UnitTestMapperGLFW.cxx | 12 +++---- .../testing/glut/UnitTestMapperGLUT.cxx | 6 ++-- .../testing/osmesa/UnitTestMapperOSMesa.cxx | 4 +-- vtkm/testing/Testing.h | 2 +- vtkm/worklet/AverageByKey.h | 2 +- vtkm/worklet/ContourTreeUniform.h | 10 +++--- vtkm/worklet/DispatcherStreamingMapField.h | 2 +- vtkm/worklet/ExternalFaces.h | 2 +- vtkm/worklet/ExtractGeometry.h | 6 ++-- vtkm/worklet/ExtractPoints.h | 4 +-- vtkm/worklet/ExtractStructured.h | 2 +- vtkm/worklet/FieldHistogram.h | 2 +- vtkm/worklet/FieldStatistics.h | 2 +- vtkm/worklet/Gradient.h | 6 ++-- vtkm/worklet/KernelSplatter.h | 8 ++--- vtkm/worklet/MarchingCubes.h | 2 +- vtkm/worklet/Mask.h | 4 +-- vtkm/worklet/MaskPoints.h | 2 +- vtkm/worklet/StreamLineUniformGrid.h | 6 ++-- vtkm/worklet/ThresholdPoints.h | 2 +- vtkm/worklet/WorkletMapTopology.h | 4 +-- .../contourtree/ActiveEdgeTransferrer.h | 2 +- vtkm/worklet/contourtree/ChainDoubler.h | 2 +- vtkm/worklet/contourtree/ChainGraph.h | 12 +++---- vtkm/worklet/contourtree/ContourTree.h | 36 +++++++++---------- vtkm/worklet/contourtree/CopyJoinSplit.h | 2 +- vtkm/worklet/contourtree/CopyNeighbors.h | 2 +- vtkm/worklet/contourtree/CopySupernodes.h | 2 +- vtkm/worklet/contourtree/DegreeDelta.h | 2 +- .../contourtree/DegreeSubrangeOffset.h | 2 +- vtkm/worklet/contourtree/FillSupernodes.h | 2 +- vtkm/worklet/contourtree/FindLeaves.h | 2 +- .../contourtree/GoverningSaddleFinder.h | 2 +- vtkm/worklet/contourtree/JoinArcConnector.h | 2 +- vtkm/worklet/contourtree/JoinSuperArcFinder.h | 4 +-- .../worklet/contourtree/JoinTreeTransferrer.h | 2 +- vtkm/worklet/contourtree/MergeTree.h | 4 +-- .../contourtree/Mesh2D_DEM_SaddleStarter.h | 2 +- .../contourtree/Mesh2D_DEM_Triangulation.h | 10 +++--- .../Mesh2D_DEM_VertexOutdegreeStarter.h | 2 +- .../contourtree/Mesh2D_DEM_VertexStarter.h | 2 +- .../contourtree/Mesh3D_DEM_SaddleStarter.h | 4 +-- .../contourtree/Mesh3D_DEM_Triangulation.h | 12 +++---- .../Mesh3D_DEM_VertexOutdegreeStarter.h | 4 +-- .../contourtree/Mesh3D_DEM_VertexStarter.h | 4 +-- vtkm/worklet/contourtree/PrintVectors.h | 6 ++-- .../contourtree/RegularPointTransferrer.h | 6 ++-- vtkm/worklet/contourtree/RegularToCandidate.h | 4 +-- .../contourtree/RegularToCriticalDown.h | 2 +- .../worklet/contourtree/RegularToCriticalUp.h | 2 +- vtkm/worklet/contourtree/ResetDegrees.h | 2 +- .../worklet/contourtree/SaddleAscentFunctor.h | 2 +- .../contourtree/SaddleAscentTransferrer.h | 2 +- .../worklet/contourtree/SetJoinAndSplitArcs.h | 2 +- vtkm/worklet/contourtree/SetSupernodeInward.h | 2 +- vtkm/worklet/contourtree/SkipVertex.h | 2 +- vtkm/worklet/contourtree/SubrangeOffset.h | 2 +- vtkm/worklet/contourtree/TrunkBuilder.h | 2 +- vtkm/worklet/contourtree/UpdateOutbound.h | 2 +- .../worklet/contourtree/VertexDegreeUpdater.h | 2 +- vtkm/worklet/internal/WorkletBase.h | 4 +-- vtkm/worklet/testing/UnitTestCellAverage.cxx | 2 +- vtkm/worklet/testing/UnitTestCellGradient.cxx | 4 +-- .../worklet/testing/UnitTestExternalFaces.cxx | 4 +-- vtkm/worklet/testing/UnitTestMagnitude.cxx | 2 +- .../worklet/testing/UnitTestMarchingCubes.cxx | 2 +- .../testing/UnitTestPointElevation.cxx | 2 +- .../worklet/testing/UnitTestPointGradient.cxx | 4 +-- .../testing/UnitTestStreamLineUniformGrid.cxx | 4 +-- .../worklet/testing/UnitTestStreamingSine.cxx | 4 +-- .../testing/UnitTestTetrahedralize.cxx | 2 +- vtkm/worklet/testing/UnitTestTriangulate.cxx | 2 +- .../testing/UnitTestWaveletCompressor.cxx | 4 +-- .../UnitTestWorkletMapTopologyExplicit.cxx | 2 +- .../UnitTestWorkletMapTopologyUniform.cxx | 2 +- vtkm/worklet/wavelets/WaveletTransforms.h | 2 +- 246 files changed, 388 insertions(+), 380 deletions(-) diff --git a/CMake/VTKmDetectCUDAVersion.cu b/CMake/VTKmDetectCUDAVersion.cu index 55c45f159..43c7eaa87 100644 --- a/CMake/VTKmDetectCUDAVersion.cu +++ b/CMake/VTKmDetectCUDAVersion.cu @@ -19,9 +19,9 @@ // this software. // //============================================================================= +#include #include #include -#include int main() { int count = 0; diff --git a/examples/clipping/Clipping.cxx b/examples/clipping/Clipping.cxx index 4725e395e..c5d075609 100644 --- a/examples/clipping/Clipping.cxx +++ b/examples/clipping/Clipping.cxx @@ -29,8 +29,8 @@ #include #include #include -#include #include +#include typedef vtkm::Vec FloatVec3; diff --git a/examples/demo/Demo.cxx b/examples/demo/Demo.cxx index f6867da7a..17f1e8bce 100644 --- a/examples/demo/Demo.cxx +++ b/examples/demo/Demo.cxx @@ -18,19 +18,19 @@ // this software. //============================================================================ +#include #include +#include #include #include #include #include #include -#include -#include #include -#include #include +#include #include diff --git a/examples/multi_backend/MultiBackend.cxx b/examples/multi_backend/MultiBackend.cxx index ae11178b3..00297b332 100644 --- a/examples/multi_backend/MultiBackend.cxx +++ b/examples/multi_backend/MultiBackend.cxx @@ -26,10 +26,10 @@ #include #include -#include -#include -#include #include +#include +#include +#include typedef vtkm::Vec< vtkm::Float32, 3 > FloatVec3; typedef vtkm::Vec< vtkm::UInt8, 4 > Uint8Vec4; diff --git a/examples/rendering/Rendering.cxx b/examples/rendering/Rendering.cxx index 4ef7c504b..9a06fd779 100644 --- a/examples/rendering/Rendering.cxx +++ b/examples/rendering/Rendering.cxx @@ -43,9 +43,9 @@ #endif #include +#include #include #include -#include vtkm::rendering::View3D *view = nullptr; diff --git a/examples/streamline/StreamLineUniformGrid.cxx b/examples/streamline/StreamLineUniformGrid.cxx index 6d5af739d..a8159c532 100755 --- a/examples/streamline/StreamLineUniformGrid.cxx +++ b/examples/streamline/StreamLineUniformGrid.cxx @@ -22,17 +22,17 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL #endif -#include -#include #include #include #include +#include +#include #include #include -#include #include +#include //Suppress warnings about glut being deprecated on OSX #if (defined(VTKM_GCC) || defined(VTKM_CLANG)) diff --git a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx index 5146072e5..29e32c350 100644 --- a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx @@ -22,11 +22,11 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL #endif -#include -#include #include #include #include +#include +#include #include diff --git a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx index 7eeaa92c9..dfe20ffe2 100644 --- a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx @@ -22,10 +22,10 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL #endif -#include -#include #include #include +#include +#include #include diff --git a/examples/tetrahedra/TriangulateExplicitGrid.cxx b/examples/tetrahedra/TriangulateExplicitGrid.cxx index 118d72494..4cf90777f 100644 --- a/examples/tetrahedra/TriangulateExplicitGrid.cxx +++ b/examples/tetrahedra/TriangulateExplicitGrid.cxx @@ -22,10 +22,10 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL #endif -#include #include #include #include +#include #include diff --git a/examples/tetrahedra/TriangulateUniformGrid.cxx b/examples/tetrahedra/TriangulateUniformGrid.cxx index d5d7b5666..586d829c3 100644 --- a/examples/tetrahedra/TriangulateUniformGrid.cxx +++ b/examples/tetrahedra/TriangulateUniformGrid.cxx @@ -22,10 +22,10 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL #endif -#include -#include #include #include +#include +#include #include diff --git a/examples/unified_memory/UnifiedMemory.cu b/examples/unified_memory/UnifiedMemory.cu index 826f9aa9f..d44626c2d 100644 --- a/examples/unified_memory/UnifiedMemory.cu +++ b/examples/unified_memory/UnifiedMemory.cu @@ -21,9 +21,9 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_CUDA #include -#include #include #include +#include #include #include diff --git a/vtkm/BinaryOperators.h b/vtkm/BinaryOperators.h index c38292142..a0ba01101 100644 --- a/vtkm/BinaryOperators.h +++ b/vtkm/BinaryOperators.h @@ -20,8 +20,8 @@ #ifndef vtk_m_BinaryOperators_h #define vtk_m_BinaryOperators_h -#include #include +#include namespace vtkm { diff --git a/vtkm/Math.h b/vtkm/Math.h index cf1394441..74d8fe5db 100644 --- a/vtkm/Math.h +++ b/vtkm/Math.h @@ -25,15 +25,15 @@ #ifndef vtk_m_Math_h #define vtk_m_Math_h -#include #include +#include #include #ifndef VTKM_CUDA +#include #include #include #include -#include #endif // !VTKM_CUDA #if !defined(__CUDA_ARCH__) diff --git a/vtkm/Matrix.h b/vtkm/Matrix.h index 70ff4cbcc..ad49a461b 100644 --- a/vtkm/Matrix.h +++ b/vtkm/Matrix.h @@ -24,8 +24,8 @@ #include #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/StaticAssert.h b/vtkm/StaticAssert.h index d51bed6cd..5d15f69b3 100644 --- a/vtkm/StaticAssert.h +++ b/vtkm/StaticAssert.h @@ -20,8 +20,8 @@ #ifndef vtk_m_StaticAssert_h #define vtk_m_StaticAssert_h -#include #include +#include #define VTKM_STATIC_ASSERT(condition) \ static_assert( (condition), "Failed static assert: " #condition) diff --git a/vtkm/VecFromPortal.h b/vtkm/VecFromPortal.h index 91efa2d55..d48cc2b64 100644 --- a/vtkm/VecFromPortal.h +++ b/vtkm/VecFromPortal.h @@ -21,8 +21,8 @@ #define vtk_m_VecFromPortal_h #include -#include #include +#include #include #include diff --git a/vtkm/VecFromPortalPermute.h b/vtkm/VecFromPortalPermute.h index 454f43d42..a2d4ac2c2 100644 --- a/vtkm/VecFromPortalPermute.h +++ b/vtkm/VecFromPortalPermute.h @@ -21,8 +21,8 @@ #define vtk_m_VecFromPortalPermute_h #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/VecRectilinearPointCoordinates.h b/vtkm/VecRectilinearPointCoordinates.h index c8ab3cf3b..97b9b972b 100644 --- a/vtkm/VecRectilinearPointCoordinates.h +++ b/vtkm/VecRectilinearPointCoordinates.h @@ -21,8 +21,8 @@ #define vtk_m_exec_VecRectilinearPointCoordinates_h #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/VecVariable.h b/vtkm/VecVariable.h index fcf75fe69..d7684dad7 100644 --- a/vtkm/VecVariable.h +++ b/vtkm/VecVariable.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/VectorAnalysis.h b/vtkm/VectorAnalysis.h index 2ca4084fc..9180ddde2 100644 --- a/vtkm/VectorAnalysis.h +++ b/vtkm/VectorAnalysis.h @@ -25,8 +25,8 @@ // This header file defines math functions that deal with linear albegra funcitons #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx index b6802ba9f..384b8c74c 100644 --- a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx +++ b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx @@ -19,19 +19,19 @@ //============================================================================ #include +#include #include -#include #include +#include #include #include #include +#include #include #include #include -#include #include #include -#include #include diff --git a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx index 414e1e47f..0b8232410 100644 --- a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx +++ b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx @@ -28,13 +28,13 @@ #include #include -#include -#include #include #include +#include +#include -#include #include +#include #include #include diff --git a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx index 349e64d04..aed93d057 100644 --- a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx +++ b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx @@ -24,13 +24,13 @@ #include #include -#include -#include #include #include +#include +#include -#include #include +#include #include #include diff --git a/vtkm/benchmarking/Benchmarker.h b/vtkm/benchmarking/Benchmarker.h index fea1d008a..29dede896 100644 --- a/vtkm/benchmarking/Benchmarker.h +++ b/vtkm/benchmarking/Benchmarker.h @@ -23,9 +23,9 @@ #include -#include #include #include +#include /* * Writing a Benchmark diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 19a2e472e..ad19dfa14 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -31,9 +31,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/vtkm/cont/ArrayHandleDiscard.h b/vtkm/cont/ArrayHandleDiscard.h index dfa18cbdd..50bf139b7 100644 --- a/vtkm/cont/ArrayHandleDiscard.h +++ b/vtkm/cont/ArrayHandleDiscard.h @@ -20,8 +20,8 @@ #ifndef vtk_m_cont_ArrayHandleDiscard_h #define vtk_m_cont_ArrayHandleDiscard_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/cont/ArrayHandleUniformPointCoordinates.h b/vtkm/cont/ArrayHandleUniformPointCoordinates.h index ad32d6af5..91a2261a8 100644 --- a/vtkm/cont/ArrayHandleUniformPointCoordinates.h +++ b/vtkm/cont/ArrayHandleUniformPointCoordinates.h @@ -20,9 +20,9 @@ #ifndef vtk_m_cont_ArrayHandleUniformPointCoordinates_h #define vtk_m_cont_ArrayHandleUniformPointCoordinates_h -#include #include #include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/ArrayHandleZip.h b/vtkm/cont/ArrayHandleZip.h index d6018fb86..92e2e04ec 100644 --- a/vtkm/cont/ArrayHandleZip.h +++ b/vtkm/cont/ArrayHandleZip.h @@ -20,8 +20,8 @@ #ifndef vtk_m_cont_ArrayHandleZip_h #define vtk_m_cont_ArrayHandleZip_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/cont/CellSet.h b/vtkm/cont/CellSet.h index a267e18c4..8945ed5c9 100644 --- a/vtkm/cont/CellSet.h +++ b/vtkm/cont/CellSet.h @@ -25,9 +25,9 @@ #include #include -#include -#include #include +#include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index 9fc1c3f59..fdb3e2c4d 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -21,16 +21,16 @@ #define vtk_m_cont_CellSetExplicit_h #include +#include #include #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include diff --git a/vtkm/cont/CellSetStructured.h b/vtkm/cont/CellSetStructured.h index 7360e7920..bf0da72e4 100644 --- a/vtkm/cont/CellSetStructured.h +++ b/vtkm/cont/CellSetStructured.h @@ -22,11 +22,11 @@ #include +#include #include #include -#include -#include #include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/CoordinateSystem.h b/vtkm/cont/CoordinateSystem.h index 8d0568fa5..6cecc2ba2 100644 --- a/vtkm/cont/CoordinateSystem.h +++ b/vtkm/cont/CoordinateSystem.h @@ -22,9 +22,9 @@ #include -#include -#include #include +#include +#include #include #ifndef VTKM_DEFAULT_COORDINATE_SYSTEM_TYPE_LIST_TAG diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h index c2a4f1045..bb75f6914 100644 --- a/vtkm/cont/DataSet.h +++ b/vtkm/cont/DataSet.h @@ -22,9 +22,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/vtkm/cont/DeviceAdapter.h b/vtkm/cont/DeviceAdapter.h index 75d564f66..5d2cb8214 100644 --- a/vtkm/cont/DeviceAdapter.h +++ b/vtkm/cont/DeviceAdapter.h @@ -22,12 +22,14 @@ // These are listed in non-alphabetical order because this is the conceptual // order in which the sub-files are loaded. (But the compile should still -// succeed of the order is changed.) +// succeed of the order is changed.) Turn off formatting to keep the order. +// clang-format off #include #include #include #include +// clang-format on namespace vtkm { namespace cont { diff --git a/vtkm/cont/DeviceAdapterListTag.h b/vtkm/cont/DeviceAdapterListTag.h index 5ddf2b238..a6ae7b66e 100644 --- a/vtkm/cont/DeviceAdapterListTag.h +++ b/vtkm/cont/DeviceAdapterListTag.h @@ -27,8 +27,8 @@ #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h index d26c4f0f7..296744e9c 100644 --- a/vtkm/cont/Field.h +++ b/vtkm/cont/Field.h @@ -26,8 +26,8 @@ #include #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/cont/ImplicitFunction.h b/vtkm/cont/ImplicitFunction.h index 2d6be4030..fc7a0f779 100644 --- a/vtkm/cont/ImplicitFunction.h +++ b/vtkm/cont/ImplicitFunction.h @@ -20,8 +20,8 @@ #ifndef vtk_m_cont_ImplicitFunction_h #define vtk_m_cont_ImplicitFunction_h -#include #include +#include #include diff --git a/vtkm/cont/ImplicitFunction.hxx b/vtkm/cont/ImplicitFunction.hxx index 8a8014543..8485ca0b1 100644 --- a/vtkm/cont/ImplicitFunction.hxx +++ b/vtkm/cont/ImplicitFunction.hxx @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#include #include +#include #include #include diff --git a/vtkm/cont/RuntimeDeviceTracker.cxx b/vtkm/cont/RuntimeDeviceTracker.cxx index 591b5ede5..0409470fb 100644 --- a/vtkm/cont/RuntimeDeviceTracker.cxx +++ b/vtkm/cont/RuntimeDeviceTracker.cxx @@ -24,8 +24,8 @@ #include #include -#include #include +#include #include #include diff --git a/vtkm/cont/StorageBasic.h b/vtkm/cont/StorageBasic.h index aab94ea97..d358a84c1 100644 --- a/vtkm/cont/StorageBasic.h +++ b/vtkm/cont/StorageBasic.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include #include diff --git a/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx b/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx index 4fddec6fb..1a7aa1e38 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx @@ -26,8 +26,8 @@ #include -#include #include +#include namespace { diff --git a/vtkm/cont/cuda/ArrayHandleCuda.h b/vtkm/cont/cuda/ArrayHandleCuda.h index 60ece1ce2..35d8f7fe4 100644 --- a/vtkm/cont/cuda/ArrayHandleCuda.h +++ b/vtkm/cont/cuda/ArrayHandleCuda.h @@ -23,8 +23,8 @@ #define vtk_m_cont_cuda_ArrayHandleCuda_h #include -#include #include +#include #include #ifdef VTKM_CUDA diff --git a/vtkm/cont/cuda/ChooseCudaDevice.h b/vtkm/cont/cuda/ChooseCudaDevice.h index 676539321..ef49e0441 100644 --- a/vtkm/cont/cuda/ChooseCudaDevice.h +++ b/vtkm/cont/cuda/ChooseCudaDevice.h @@ -24,8 +24,8 @@ #include -#include #include +#include #include namespace vtkm{ diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h index 5e2858346..6cfd58c7e 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h @@ -22,9 +22,9 @@ #include +#include #include #include -#include // These must be placed in the vtkm::cont::internal namespace so that // the template can be found. diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h index 7a8160fe7..34985d32e 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h @@ -26,9 +26,9 @@ // Disable warnings we check vtkm for but Thrust does not. VTKM_THIRDPARTY_PRE_INCLUDE -#include -#include #include +#include +#include #include diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h index 58f159442..57a865a49 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h @@ -21,8 +21,8 @@ #define vtk_m_cont_cuda_internal_DeviceAdapterAlgorithmCuda_h #include -#include #include +#include #include diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h index 00522b1ca..fa3241831 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h @@ -21,12 +21,12 @@ #ifndef vtk_m_cont_cuda_internal_DeviceAdapterAlgorithmThrust_h #define vtk_m_cont_cuda_internal_DeviceAdapterAlgorithmThrust_h +#include +#include +#include #include #include #include -#include -#include -#include #include @@ -46,15 +46,15 @@ // Disable warnings we check vtkm for but Thrust does not. VTKM_THIRDPARTY_PRE_INCLUDE //our own custom thrust execution policy -#include #include #include #include #include #include #include -#include #include +#include +#include #include #include diff --git a/vtkm/cont/cuda/internal/MakeThrustIterator.h b/vtkm/cont/cuda/internal/MakeThrustIterator.h index f64fe0989..58b50998d 100644 --- a/vtkm/cont/cuda/internal/MakeThrustIterator.h +++ b/vtkm/cont/cuda/internal/MakeThrustIterator.h @@ -20,20 +20,20 @@ #ifndef vtk_m_cont_cuda_internal_MakeThrustIterator_h #define vtk_m_cont_cuda_internal_MakeThrustIterator_h -#include #include -#include +#include #include +#include #include #include // Disable warnings we check vtkm for but Thrust does not. VTKM_THIRDPARTY_PRE_INCLUDE -#include #include #include #include +#include VTKM_THIRDPARTY_POST_INCLUDE namespace vtkm { diff --git a/vtkm/cont/cuda/internal/ThrustExceptionHandler.h b/vtkm/cont/cuda/internal/ThrustExceptionHandler.h index a0195dca6..b1ff67a24 100644 --- a/vtkm/cont/cuda/internal/ThrustExceptionHandler.h +++ b/vtkm/cont/cuda/internal/ThrustExceptionHandler.h @@ -20,9 +20,9 @@ #ifndef vtk_m_cont_cuda_interal_ThrustExecptionHandler_h #define vtk_m_cont_cuda_interal_ThrustExecptionHandler_h -#include #include #include +#include VTKM_THIRDPARTY_PRE_INCLUDE #include diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu index ef503dfca..5b9fba2e3 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu @@ -23,11 +23,11 @@ #endif #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR -#include #include +#include -#include #include +#include #include diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu index af7c7cc4d..b7d8fe5b9 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu @@ -25,8 +25,8 @@ #include -#include #include +#include int UnitTestCudaArrayHandleFancy(int, char *[]) { diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu b/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu index 2befd0e17..dea23339f 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu @@ -23,8 +23,8 @@ #endif #include -#include #include +#include int UnitTestCudaDataSetExplicit(int, char *[]) { diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu b/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu index 2af5452e6..4fd2b39ef 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu @@ -25,8 +25,8 @@ #include -#include #include +#include int UnitTestCudaDataSetSingleType(int, char *[]) { diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu b/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu index ace9e1cb2..670d5c3a2 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu @@ -25,8 +25,8 @@ #include -#include #include +#include int UnitTestCudaDeviceAdapter(int, char *[]) { diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h index 3c9978d6f..ba6f13369 100644 --- a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h +++ b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h @@ -21,10 +21,10 @@ #ifndef vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h #define vtk_m_cont_internal_DeviceAdapterAlgorithmGeneral_h -#include #include #include #include +#include #include #include diff --git a/vtkm/cont/internal/DeviceAdapterDefaultSelection.h b/vtkm/cont/internal/DeviceAdapterDefaultSelection.h index 806ff86f0..81f1065cb 100644 --- a/vtkm/cont/internal/DeviceAdapterDefaultSelection.h +++ b/vtkm/cont/internal/DeviceAdapterDefaultSelection.h @@ -24,8 +24,8 @@ #ifndef vtk_m_cont_internal_DeviceAdapterDefaultSelection_h #define vtk_m_cont_internal_DeviceAdapterDefaultSelection_h -#include #include +#include //----------------------------------------------------------------------------- // Select the default devices based on available options. diff --git a/vtkm/cont/internal/DeviceAdapterTag.h b/vtkm/cont/internal/DeviceAdapterTag.h index 8c3540f55..1bd2a2717 100644 --- a/vtkm/cont/internal/DeviceAdapterTag.h +++ b/vtkm/cont/internal/DeviceAdapterTag.h @@ -21,9 +21,9 @@ #define vtk_m_cont_internal_DeviceAdapterTag_h #include +#include #include #include -#include #include diff --git a/vtkm/cont/internal/FunctorsGeneral.h b/vtkm/cont/internal/FunctorsGeneral.h index e43c2fcf6..34c70861c 100644 --- a/vtkm/cont/internal/FunctorsGeneral.h +++ b/vtkm/cont/internal/FunctorsGeneral.h @@ -20,10 +20,10 @@ #ifndef vtk_m_cont_internal_FunctorsGeneral_h #define vtk_m_cont_internal_FunctorsGeneral_h -#include #include #include #include +#include #include diff --git a/vtkm/cont/internal/IteratorFromArrayPortal.h b/vtkm/cont/internal/IteratorFromArrayPortal.h index b1c875d25..6911e11e2 100644 --- a/vtkm/cont/internal/IteratorFromArrayPortal.h +++ b/vtkm/cont/internal/IteratorFromArrayPortal.h @@ -21,8 +21,8 @@ #define vtk_m_cont_internal_IteratorFromArrayPortal_h #include -#include #include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/internal/SimplePolymorphicContainer.h b/vtkm/cont/internal/SimplePolymorphicContainer.h index 784166ac7..cb401a560 100644 --- a/vtkm/cont/internal/SimplePolymorphicContainer.h +++ b/vtkm/cont/internal/SimplePolymorphicContainer.h @@ -22,8 +22,8 @@ #include -#include #include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx b/vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx index 142d63b14..d6c3700d1 100644 --- a/vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx +++ b/vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace { diff --git a/vtkm/cont/serial/DeviceAdapterSerial.h b/vtkm/cont/serial/DeviceAdapterSerial.h index 1c83672bc..e715b45de 100644 --- a/vtkm/cont/serial/DeviceAdapterSerial.h +++ b/vtkm/cont/serial/DeviceAdapterSerial.h @@ -20,9 +20,12 @@ #ifndef vtk_m_cont_serial_DeviceAdapterSerial_h #define vtk_m_cont_serial_DeviceAdapterSerial_h +// Keep headers in this order. +// clang-format off #include #include #include #include +// clang-format on #endif //vtk_m_cont_serial_DeviceAdapterSerial_h diff --git a/vtkm/cont/serial/internal/VirtualObjectTransferSerial.h b/vtkm/cont/serial/internal/VirtualObjectTransferSerial.h index fcfda6ac8..098a7f770 100644 --- a/vtkm/cont/serial/internal/VirtualObjectTransferSerial.h +++ b/vtkm/cont/serial/internal/VirtualObjectTransferSerial.h @@ -20,9 +20,9 @@ #ifndef vtk_m_cont_serial_internal_VirtualObjectTransferSerial_h #define vtk_m_cont_serial_internal_VirtualObjectTransferSerial_h -#include #include #include +#include namespace vtkm { diff --git a/vtkm/cont/tbb/internal/FunctorsTBB.h b/vtkm/cont/tbb/internal/FunctorsTBB.h index 570a57834..b8b0e3f97 100644 --- a/vtkm/cont/tbb/internal/FunctorsTBB.h +++ b/vtkm/cont/tbb/internal/FunctorsTBB.h @@ -20,8 +20,8 @@ #ifndef vtk_m_cont_tbb_internal_FunctorsTBB_h #define vtk_m_cont_tbb_internal_FunctorsTBB_h -#include #include +#include #include #include #include @@ -54,6 +54,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE #include #endif +#include #include #include #include @@ -61,7 +62,6 @@ VTKM_THIRDPARTY_PRE_INCLUDE #include #include #include -#include #if defined(VTKM_MSVC) #pragma pop_macro("__TBB_NO_IMPLICITLINKAGE") diff --git a/vtkm/cont/tbb/internal/VirtualObjectTransferTBB.h b/vtkm/cont/tbb/internal/VirtualObjectTransferTBB.h index 63349cde5..600bc3e07 100644 --- a/vtkm/cont/tbb/internal/VirtualObjectTransferTBB.h +++ b/vtkm/cont/tbb/internal/VirtualObjectTransferTBB.h @@ -20,9 +20,9 @@ #ifndef vtk_m_cont_tbb_internal_VirtualObjectTransferTBB_h #define vtk_m_cont_tbb_internal_VirtualObjectTransferTBB_h -#include #include #include +#include namespace vtkm { diff --git a/vtkm/cont/tbb/internal/parallel_sort.h b/vtkm/cont/tbb/internal/parallel_sort.h index 3412a58c3..61bdd2a8f 100644 --- a/vtkm/cont/tbb/internal/parallel_sort.h +++ b/vtkm/cont/tbb/internal/parallel_sort.h @@ -29,12 +29,12 @@ #ifndef __TBB_parallel_sort_H #define __TBB_parallel_sort_H -#include #include +#include #include -#include #include +#include namespace tbb { diff --git a/vtkm/cont/testing/ExplicitTestData.h b/vtkm/cont/testing/ExplicitTestData.h index 93f93a8c6..5df6a66c2 100644 --- a/vtkm/cont/testing/ExplicitTestData.h +++ b/vtkm/cont/testing/ExplicitTestData.h @@ -20,8 +20,8 @@ // //============================================================================= -#include #include +#include namespace vtkm { namespace cont { diff --git a/vtkm/cont/testing/TestingArrayHandles.h b/vtkm/cont/testing/TestingArrayHandles.h index b9163f49c..5d75a1452 100644 --- a/vtkm/cont/testing/TestingArrayHandles.h +++ b/vtkm/cont/testing/TestingArrayHandles.h @@ -20,8 +20,8 @@ #ifndef vtk_m_cont_testing_TestingArrayHandles_h #define vtk_m_cont_testing_TestingArrayHandles_h -#include #include +#include #include #include diff --git a/vtkm/cont/testing/TestingDataSetExplicit.h b/vtkm/cont/testing/TestingDataSetExplicit.h index e08cd51e0..1cec4d52b 100644 --- a/vtkm/cont/testing/TestingDataSetExplicit.h +++ b/vtkm/cont/testing/TestingDataSetExplicit.h @@ -21,10 +21,10 @@ #ifndef vtk_m_cont_testing_TestingDataSetExplicit_h #define vtk_m_cont_testing_TestingDataSetExplicit_h -#include #include #include #include +#include #include diff --git a/vtkm/cont/testing/TestingDataSetSingleType.h b/vtkm/cont/testing/TestingDataSetSingleType.h index ab4a92959..4f7e40872 100644 --- a/vtkm/cont/testing/TestingDataSetSingleType.h +++ b/vtkm/cont/testing/TestingDataSetSingleType.h @@ -21,12 +21,12 @@ #ifndef vtk_m_cont_testing_TestingDataSetSingleType_h #define vtk_m_cont_testing_TestingDataSetSingleType_h -#include +#include #include #include #include -#include #include +#include #include #include diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h index 0c9030a96..56bf441e3 100644 --- a/vtkm/cont/testing/TestingDeviceAdapter.h +++ b/vtkm/cont/testing/TestingDeviceAdapter.h @@ -20,9 +20,9 @@ #ifndef vtk_m_cont_testing_TestingDeviceAdapter_h #define vtk_m_cont_testing_TestingDeviceAdapter_h -#include -#include #include +#include +#include #include #include @@ -30,12 +30,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/vtkm/cont/testing/TestingFancyArrayHandles.h b/vtkm/cont/testing/TestingFancyArrayHandles.h index fd160a490..0b4cabe55 100644 --- a/vtkm/cont/testing/TestingFancyArrayHandles.h +++ b/vtkm/cont/testing/TestingFancyArrayHandles.h @@ -22,6 +22,7 @@ #ifndef vtk_m_cont_testing_TestingFancyArrayHandles_h #define vtk_m_cont_testing_TestingFancyArrayHandles_h +#include #include #include #include @@ -36,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/vtkm/cont/testing/TestingVirtualObjectCache.h b/vtkm/cont/testing/TestingVirtualObjectCache.h index 2c823d341..bf91588ab 100644 --- a/vtkm/cont/testing/TestingVirtualObjectCache.h +++ b/vtkm/cont/testing/TestingVirtualObjectCache.h @@ -20,12 +20,12 @@ #ifndef vtk_m_cont_testing_TestingVirtualObjectCache_h #define vtk_m_cont_testing_TestingVirtualObjectCache_h +#include #include #include #include -#include #include -#include +#include #define ARRAY_LEN 8 diff --git a/vtkm/cont/testing/UnitTestArrayHandleCartesianProduct.cxx b/vtkm/cont/testing/UnitTestArrayHandleCartesianProduct.cxx index 6ae3fe79b..f2204e140 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleCartesianProduct.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleCartesianProduct.cxx @@ -20,8 +20,8 @@ // //============================================================================= -#include #include +#include #include #include diff --git a/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx b/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx index c9c4d94a1..eeb2b4c00 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx @@ -29,8 +29,8 @@ #include #include -#include #include +#include #include diff --git a/vtkm/cont/testing/UnitTestArrayHandleConcatenate.cxx b/vtkm/cont/testing/UnitTestArrayHandleConcatenate.cxx index 8973f49c3..b149ce4f9 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleConcatenate.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleConcatenate.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include diff --git a/vtkm/cont/testing/UnitTestArrayHandleReverse.cxx b/vtkm/cont/testing/UnitTestArrayHandleReverse.cxx index 33fd59502..956eaa3a9 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleReverse.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleReverse.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace UnitTestArrayHandleIndexNamespace { diff --git a/vtkm/cont/testing/UnitTestDataSetBuilderExplicit.cxx b/vtkm/cont/testing/UnitTestDataSetBuilderExplicit.cxx index 0463db157..75d94cc93 100644 --- a/vtkm/cont/testing/UnitTestDataSetBuilderExplicit.cxx +++ b/vtkm/cont/testing/UnitTestDataSetBuilderExplicit.cxx @@ -22,9 +22,9 @@ #include #include -#include -#include #include +#include +#include #include diff --git a/vtkm/cont/testing/UnitTestDataSetBuilderUniform.cxx b/vtkm/cont/testing/UnitTestDataSetBuilderUniform.cxx index 3d7d56da5..384362b5d 100644 --- a/vtkm/cont/testing/UnitTestDataSetBuilderUniform.cxx +++ b/vtkm/cont/testing/UnitTestDataSetBuilderUniform.cxx @@ -26,8 +26,8 @@ #include #include -#include #include +#include #include namespace DataSetBuilderUniformNamespace { diff --git a/vtkm/cont/testing/UnitTestDataSetPermutation.cxx b/vtkm/cont/testing/UnitTestDataSetPermutation.cxx index ff8b7836f..1ac8191bc 100644 --- a/vtkm/cont/testing/UnitTestDataSetPermutation.cxx +++ b/vtkm/cont/testing/UnitTestDataSetPermutation.cxx @@ -18,14 +18,14 @@ // this software. //============================================================================ -#include -#include #include +#include +#include #include #include -#include #include +#include #include #include diff --git a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx index 5489a9e8e..e7058e291 100644 --- a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx +++ b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx @@ -26,9 +26,9 @@ #include -#include -#include #include +#include +#include static void TwoDimRectilinearTest(); static void ThreeDimRectilinearTest(); diff --git a/vtkm/cont/testing/UnitTestDataSetUniform.cxx b/vtkm/cont/testing/UnitTestDataSetUniform.cxx index 1fe9a0c5f..852d75bc9 100644 --- a/vtkm/cont/testing/UnitTestDataSetUniform.cxx +++ b/vtkm/cont/testing/UnitTestDataSetUniform.cxx @@ -26,8 +26,8 @@ #include -#include #include +#include static void TwoDimUniformTest(); static void ThreeDimUniformTest(); diff --git a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx index f4c15632d..f60fe1034 100644 --- a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx +++ b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx @@ -28,8 +28,8 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR -#include #include +#include #include diff --git a/vtkm/cont/testing/UnitTestRuntimeDeviceInformation.cxx b/vtkm/cont/testing/UnitTestRuntimeDeviceInformation.cxx index 9e5e88422..c0c399f7e 100644 --- a/vtkm/cont/testing/UnitTestRuntimeDeviceInformation.cxx +++ b/vtkm/cont/testing/UnitTestRuntimeDeviceInformation.cxx @@ -22,8 +22,8 @@ //include all backends #include -#include #include +#include #include diff --git a/vtkm/cont/testing/UnitTestStorageBasic.cxx b/vtkm/cont/testing/UnitTestStorageBasic.cxx index 32a61ebe1..bb7b8b7ec 100644 --- a/vtkm/cont/testing/UnitTestStorageBasic.cxx +++ b/vtkm/cont/testing/UnitTestStorageBasic.cxx @@ -23,18 +23,18 @@ #include #include -#include #include +#include // We use these to check if the aligned allocator provided by // StorageBasic can be used with all STL containers -#include #include #include -#include #include -#include #include +#include +#include +#include namespace { diff --git a/vtkm/cont/testing/UnitTestTryExecute.cxx b/vtkm/cont/testing/UnitTestTryExecute.cxx index 4b9edc1fb..5f5730933 100644 --- a/vtkm/cont/testing/UnitTestTryExecute.cxx +++ b/vtkm/cont/testing/UnitTestTryExecute.cxx @@ -21,8 +21,8 @@ #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_ERROR #include -#include #include +#include #include diff --git a/vtkm/exec/AtomicArray.h b/vtkm/exec/AtomicArray.h index 1ade7b20a..54015e34d 100644 --- a/vtkm/exec/AtomicArray.h +++ b/vtkm/exec/AtomicArray.h @@ -21,8 +21,8 @@ #define vtk_m_exec_AtomicArray_h #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/CellDerivative.h b/vtkm/exec/CellDerivative.h index b8cba3e47..13a758c32 100644 --- a/vtkm/exec/CellDerivative.h +++ b/vtkm/exec/CellDerivative.h @@ -29,8 +29,8 @@ #include #include -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/CellEdge.h b/vtkm/exec/CellEdge.h index d2db2c85d..621ef105a 100644 --- a/vtkm/exec/CellEdge.h +++ b/vtkm/exec/CellEdge.h @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/CellFace.h b/vtkm/exec/CellFace.h index 1095f47c5..bb5a7b759 100644 --- a/vtkm/exec/CellFace.h +++ b/vtkm/exec/CellFace.h @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/ExecutionWholeArray.h b/vtkm/exec/ExecutionWholeArray.h index 30eaa4568..713c26e3b 100644 --- a/vtkm/exec/ExecutionWholeArray.h +++ b/vtkm/exec/ExecutionWholeArray.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_ExecutionWholeArray_h #define vtk_m_exec_ExecutionWholeArray_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/ParametricCoordinates.h b/vtkm/exec/ParametricCoordinates.h index e9962e25a..810227eb0 100644 --- a/vtkm/exec/ParametricCoordinates.h +++ b/vtkm/exec/ParametricCoordinates.h @@ -25,10 +25,10 @@ #include #include #include -#include #include #include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/arg/CellShape.h b/vtkm/exec/arg/CellShape.h index 2c1f7c666..222bd9b7e 100644 --- a/vtkm/exec/arg/CellShape.h +++ b/vtkm/exec/arg/CellShape.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_CellShape_h #define vtk_m_exec_arg_CellShape_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h b/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h index 7801e1621..9f42bd992 100644 --- a/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h +++ b/vtkm/exec/arg/FetchTagArrayTopologyMapIn.h @@ -28,8 +28,8 @@ #include -#include #include +#include #include diff --git a/vtkm/exec/arg/FromCount.h b/vtkm/exec/arg/FromCount.h index 65f10a4f2..07d1d98ed 100644 --- a/vtkm/exec/arg/FromCount.h +++ b/vtkm/exec/arg/FromCount.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_FromCount_h #define vtk_m_exec_arg_FromCount_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/arg/FromIndices.h b/vtkm/exec/arg/FromIndices.h index 37e6feec7..73e723fb2 100644 --- a/vtkm/exec/arg/FromIndices.h +++ b/vtkm/exec/arg/FromIndices.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_FromIndices_h #define vtk_m_exec_arg_FromIndices_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/arg/InputIndex.h b/vtkm/exec/arg/InputIndex.h index e1e892fe2..732e5f74b 100644 --- a/vtkm/exec/arg/InputIndex.h +++ b/vtkm/exec/arg/InputIndex.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_InputIndex_h #define vtk_m_exec_arg_InputIndex_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/arg/OutputIndex.h b/vtkm/exec/arg/OutputIndex.h index 261fedd22..9f34904e4 100644 --- a/vtkm/exec/arg/OutputIndex.h +++ b/vtkm/exec/arg/OutputIndex.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_OutputIndex_h #define vtk_m_exec_arg_OutputIndex_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/arg/ThreadIndices.h b/vtkm/exec/arg/ThreadIndices.h index 3d170e25b..60a16b22d 100644 --- a/vtkm/exec/arg/ThreadIndices.h +++ b/vtkm/exec/arg/ThreadIndices.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_ThreadIndices_h #define vtk_m_exec_arg_ThreadIndices_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/arg/ValueCount.h b/vtkm/exec/arg/ValueCount.h index d8868a177..5b5dbfff1 100644 --- a/vtkm/exec/arg/ValueCount.h +++ b/vtkm/exec/arg/ValueCount.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_ValueCount_h #define vtk_m_exec_arg_ValueCount_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/exec/arg/VisitIndex.h b/vtkm/exec/arg/VisitIndex.h index 5481c1d69..967ca9324 100644 --- a/vtkm/exec/arg/VisitIndex.h +++ b/vtkm/exec/arg/VisitIndex.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_VisitIndex_h #define vtk_m_exec_arg_VisitIndex_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/arg/WorkIndex.h b/vtkm/exec/arg/WorkIndex.h index ade7b6109..1a17b6c01 100644 --- a/vtkm/exec/arg/WorkIndex.h +++ b/vtkm/exec/arg/WorkIndex.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_arg_WorkIndex_h #define vtk_m_exec_arg_WorkIndex_h -#include #include +#include namespace vtkm { namespace exec { diff --git a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h index d4727c791..6c7049143 100644 --- a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h +++ b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h @@ -20,8 +20,8 @@ #ifndef vtk_m_exec_cuda_internal_IteratorFromArrayPortal_h #define vtk_m_exec_cuda_internal_IteratorFromArrayPortal_h -#include #include +#include #include // Disable warnings we check vtkm for but Thrust does not. diff --git a/vtkm/exec/cuda/internal/WrappedOperators.h b/vtkm/exec/cuda/internal/WrappedOperators.h index 821bfcda2..2971cf984 100644 --- a/vtkm/exec/cuda/internal/WrappedOperators.h +++ b/vtkm/exec/cuda/internal/WrappedOperators.h @@ -20,11 +20,11 @@ #ifndef vtk_m_exec_cuda_internal_WrappedOperators_h #define vtk_m_exec_cuda_internal_WrappedOperators_h -#include #include #include -#include +#include #include +#include // Disable warnings we check vtkm for but Thrust does not. VTKM_THIRDPARTY_PRE_INCLUDE diff --git a/vtkm/exec/cuda/internal/testing/UnitTestTextureMemorySupport.cu b/vtkm/exec/cuda/internal/testing/UnitTestTextureMemorySupport.cu index ee1aebaec..0ceff6a84 100644 --- a/vtkm/exec/cuda/internal/testing/UnitTestTextureMemorySupport.cu +++ b/vtkm/exec/cuda/internal/testing/UnitTestTextureMemorySupport.cu @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include namespace { diff --git a/vtkm/exec/internal/testing/UnitTestErrorMessageBuffer.cxx b/vtkm/exec/internal/testing/UnitTestErrorMessageBuffer.cxx index 76acae5bd..25f4dd692 100644 --- a/vtkm/exec/internal/testing/UnitTestErrorMessageBuffer.cxx +++ b/vtkm/exec/internal/testing/UnitTestErrorMessageBuffer.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace { diff --git a/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx b/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx index 8f711ed02..4767aea97 100644 --- a/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx +++ b/vtkm/exec/internal/testing/UnitTestTaskSingular.cxx @@ -20,9 +20,9 @@ #include +#include #include #include -#include #include diff --git a/vtkm/exec/testing/UnitTestCellInterpolate.cxx b/vtkm/exec/testing/UnitTestCellInterpolate.cxx index 4b4edbcdd..ecd3ff8f6 100644 --- a/vtkm/exec/testing/UnitTestCellInterpolate.cxx +++ b/vtkm/exec/testing/UnitTestCellInterpolate.cxx @@ -19,8 +19,8 @@ //============================================================================ #include -#include #include +#include #include #include diff --git a/vtkm/filter/ClipWithImplicitFunction.hxx b/vtkm/filter/ClipWithImplicitFunction.hxx index 40aefbb69..0be1ddbcb 100644 --- a/vtkm/filter/ClipWithImplicitFunction.hxx +++ b/vtkm/filter/ClipWithImplicitFunction.hxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include #include #include +#include #include diff --git a/vtkm/filter/ExternalFaces.h b/vtkm/filter/ExternalFaces.h index bbb5002ec..e187cd57e 100644 --- a/vtkm/filter/ExternalFaces.h +++ b/vtkm/filter/ExternalFaces.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_ExternalFaces_h #define vtk_m_filter_ExternalFaces_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/filter/ExtractPoints.h b/vtkm/filter/ExtractPoints.h index 7b7a20bc8..700f9bc3a 100644 --- a/vtkm/filter/ExtractPoints.h +++ b/vtkm/filter/ExtractPoints.h @@ -22,8 +22,8 @@ #define vtk_m_filter_ExtractPoints_h #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/filter/ExtractPoints.hxx b/vtkm/filter/ExtractPoints.hxx index a6e691043..f65912081 100644 --- a/vtkm/filter/ExtractPoints.hxx +++ b/vtkm/filter/ExtractPoints.hxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include namespace { diff --git a/vtkm/filter/FieldMetadata.h b/vtkm/filter/FieldMetadata.h index 8fb93e8d7..b5896fd6f 100644 --- a/vtkm/filter/FieldMetadata.h +++ b/vtkm/filter/FieldMetadata.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_FieldMetadata_h #define vtk_m_filter_FieldMetadata_h -#include #include +#include namespace vtkm { namespace filter { diff --git a/vtkm/filter/FilterDataSet.h b/vtkm/filter/FilterDataSet.h index 84f291434..2a26636b4 100644 --- a/vtkm/filter/FilterDataSet.h +++ b/vtkm/filter/FilterDataSet.h @@ -21,9 +21,9 @@ #ifndef vtk_m_filter_DataSetFilter_h #define vtk_m_filter_DataSetFilter_h +#include #include #include -#include #include #include diff --git a/vtkm/filter/FilterDataSetWithField.h b/vtkm/filter/FilterDataSetWithField.h index 082aabaea..82c2fb88b 100644 --- a/vtkm/filter/FilterDataSetWithField.h +++ b/vtkm/filter/FilterDataSetWithField.h @@ -21,9 +21,9 @@ #ifndef vtk_m_filter_DataSetWithFieldFilter_h #define vtk_m_filter_DataSetWithFieldFilter_h +#include #include #include -#include #include #include diff --git a/vtkm/filter/FilterField.h b/vtkm/filter/FilterField.h index d988c7f08..4343e178b 100644 --- a/vtkm/filter/FilterField.h +++ b/vtkm/filter/FilterField.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_FieldFilter_h #define vtk_m_filter_FieldFilter_h -#include #include +#include #include #include diff --git a/vtkm/filter/MarchingCubes.hxx b/vtkm/filter/MarchingCubes.hxx index 3e132601f..ec68048a0 100644 --- a/vtkm/filter/MarchingCubes.hxx +++ b/vtkm/filter/MarchingCubes.hxx @@ -19,8 +19,8 @@ //============================================================================ #include -#include #include +#include #include #include diff --git a/vtkm/filter/Mask.h b/vtkm/filter/Mask.h index 1701d25af..071e48801 100644 --- a/vtkm/filter/Mask.h +++ b/vtkm/filter/Mask.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_Mask_h #define vtk_m_filter_Mask_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/filter/MaskPoints.h b/vtkm/filter/MaskPoints.h index a2b973f95..86149145b 100644 --- a/vtkm/filter/MaskPoints.h +++ b/vtkm/filter/MaskPoints.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_MaskPoints_h #define vtk_m_filter_MaskPoints_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/filter/Threshold.hxx b/vtkm/filter/Threshold.hxx index 1ee5d1c27..3dbd3ea29 100644 --- a/vtkm/filter/Threshold.hxx +++ b/vtkm/filter/Threshold.hxx @@ -18,10 +18,10 @@ // this software. //============================================================================ -#include #include #include #include +#include #include diff --git a/vtkm/filter/ThresholdPoints.h b/vtkm/filter/ThresholdPoints.h index 87111912d..4a648d268 100644 --- a/vtkm/filter/ThresholdPoints.h +++ b/vtkm/filter/ThresholdPoints.h @@ -21,8 +21,8 @@ #ifndef vtk_m_filter_ThresholdPoints_h #define vtk_m_filter_ThresholdPoints_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h index 5e8404798..98f93d7c9 100644 --- a/vtkm/filter/internal/ResolveFieldTypeAndExecute.h +++ b/vtkm/filter/internal/ResolveFieldTypeAndExecute.h @@ -21,9 +21,9 @@ #define vtk_m_filter_internal_ResolveFieldTypeAndExecute_h #include +#include #include #include -#include #include #include diff --git a/vtkm/filter/internal/ResolveFieldTypeAndMap.h b/vtkm/filter/internal/ResolveFieldTypeAndMap.h index 18e4bbb38..9da73a1d6 100644 --- a/vtkm/filter/internal/ResolveFieldTypeAndMap.h +++ b/vtkm/filter/internal/ResolveFieldTypeAndMap.h @@ -21,9 +21,9 @@ #define vtk_m_filter_internal_ResolveFieldTypeAndMap_h #include +#include #include #include -#include #include #include diff --git a/vtkm/filter/testing/UnitTestCellAverageFilter.cxx b/vtkm/filter/testing/UnitTestCellAverageFilter.cxx index 9215b7db0..38063bd62 100644 --- a/vtkm/filter/testing/UnitTestCellAverageFilter.cxx +++ b/vtkm/filter/testing/UnitTestCellAverageFilter.cxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include -#include #include +#include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestClipWithFieldFilter.cxx b/vtkm/filter/testing/UnitTestClipWithFieldFilter.cxx index 06cb024f6..c4077aeee 100644 --- a/vtkm/filter/testing/UnitTestClipWithFieldFilter.cxx +++ b/vtkm/filter/testing/UnitTestClipWithFieldFilter.cxx @@ -21,8 +21,8 @@ #include #include -#include #include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestClipWithImplicitFunctionFilter.cxx b/vtkm/filter/testing/UnitTestClipWithImplicitFunctionFilter.cxx index 4a4bec559..c2acd0a04 100644 --- a/vtkm/filter/testing/UnitTestClipWithImplicitFunctionFilter.cxx +++ b/vtkm/filter/testing/UnitTestClipWithImplicitFunctionFilter.cxx @@ -21,8 +21,8 @@ #include #include -#include #include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestFieldMetadata.cxx b/vtkm/filter/testing/UnitTestFieldMetadata.cxx index 108040ef0..586fb9cbf 100644 --- a/vtkm/filter/testing/UnitTestFieldMetadata.cxx +++ b/vtkm/filter/testing/UnitTestFieldMetadata.cxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include -#include #include +#include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestGradient.cxx b/vtkm/filter/testing/UnitTestGradient.cxx index a15714bf8..824a5e224 100644 --- a/vtkm/filter/testing/UnitTestGradient.cxx +++ b/vtkm/filter/testing/UnitTestGradient.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestPointAverageFilter.cxx b/vtkm/filter/testing/UnitTestPointAverageFilter.cxx index 35d7228b1..8bcbfbe39 100644 --- a/vtkm/filter/testing/UnitTestPointAverageFilter.cxx +++ b/vtkm/filter/testing/UnitTestPointAverageFilter.cxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include -#include #include +#include +#include namespace { diff --git a/vtkm/filter/testing/UnitTestPointElevationFilter.cxx b/vtkm/filter/testing/UnitTestPointElevationFilter.cxx index 6ca0e202e..adea527af 100644 --- a/vtkm/filter/testing/UnitTestPointElevationFilter.cxx +++ b/vtkm/filter/testing/UnitTestPointElevationFilter.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include diff --git a/vtkm/filter/testing/UnitTestVectorMagnitudeFilter.cxx b/vtkm/filter/testing/UnitTestVectorMagnitudeFilter.cxx index cba65a91a..1a6fe0d79 100644 --- a/vtkm/filter/testing/UnitTestVectorMagnitudeFilter.cxx +++ b/vtkm/filter/testing/UnitTestVectorMagnitudeFilter.cxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include #include #include +#include #include diff --git a/vtkm/internal/ArrayPortalValueReference.h b/vtkm/internal/ArrayPortalValueReference.h index a6f152dc5..fbe0a4d19 100644 --- a/vtkm/internal/ArrayPortalValueReference.h +++ b/vtkm/internal/ArrayPortalValueReference.h @@ -20,8 +20,8 @@ #ifndef vtk_m_internal_ArrayPortalValueReference_h #define vtk_m_internal_ArrayPortalValueReference_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/internal/FunctionInterface.h b/vtkm/internal/FunctionInterface.h index 960118ed2..91f507864 100644 --- a/vtkm/internal/FunctionInterface.h +++ b/vtkm/internal/FunctionInterface.h @@ -22,8 +22,8 @@ #include -#include #include +#include #include diff --git a/vtkm/interop/BufferState.h b/vtkm/interop/BufferState.h index 65f344e7e..636344e5a 100644 --- a/vtkm/interop/BufferState.h +++ b/vtkm/interop/BufferState.h @@ -21,8 +21,8 @@ #define vtk_m_interop_BufferState_h //gl headers needs to be buffer anything to do with buffer's -#include #include +#include #include diff --git a/vtkm/interop/cuda/internal/TransferToOpenGL.h b/vtkm/interop/cuda/internal/TransferToOpenGL.h index 0defa02a6..8a87bbe7e 100644 --- a/vtkm/interop/cuda/internal/TransferToOpenGL.h +++ b/vtkm/interop/cuda/internal/TransferToOpenGL.h @@ -20,8 +20,8 @@ #ifndef vtkm_interop_cuda_internal_TransferToOpenGL_h #define vtkm_interop_cuda_internal_TransferToOpenGL_h -#include #include +#include #include #include diff --git a/vtkm/interop/internal/BufferTypePicker.h b/vtkm/interop/internal/BufferTypePicker.h index 216793b74..973535f92 100644 --- a/vtkm/interop/internal/BufferTypePicker.h +++ b/vtkm/interop/internal/BufferTypePicker.h @@ -20,8 +20,8 @@ #ifndef vtk_m_interop_internal_BufferTypePicker_h #define vtk_m_interop_internal_BufferTypePicker_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/interop/internal/OpenGLHeaders.h b/vtkm/interop/internal/OpenGLHeaders.h index 2a84a2162..dc638eaae 100644 --- a/vtkm/interop/internal/OpenGLHeaders.h +++ b/vtkm/interop/internal/OpenGLHeaders.h @@ -24,14 +24,17 @@ #if defined(__APPLE__) # include + # include #else # include + # include #endif #ifdef VTKM_CUDA # include + # include #endif diff --git a/vtkm/interop/internal/TransferToOpenGL.h b/vtkm/interop/internal/TransferToOpenGL.h index 725f3fbb2..e491ecf50 100644 --- a/vtkm/interop/internal/TransferToOpenGL.h +++ b/vtkm/interop/internal/TransferToOpenGL.h @@ -21,11 +21,11 @@ #define vtk_m_interop_internal_TransferToOpenGL_h #include -#include #include +#include -#include #include +#include namespace vtkm { diff --git a/vtkm/interop/internal/testing/UnitTestBufferTypePicker.cxx b/vtkm/interop/internal/testing/UnitTestBufferTypePicker.cxx index 2d61a7ca9..54498b9d6 100644 --- a/vtkm/interop/internal/testing/UnitTestBufferTypePicker.cxx +++ b/vtkm/interop/internal/testing/UnitTestBufferTypePicker.cxx @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#include #include +#include namespace { diff --git a/vtkm/interop/internal/testing/UnitTestOpenGLHeaders.cxx b/vtkm/interop/internal/testing/UnitTestOpenGLHeaders.cxx index d161cc573..23e67d914 100644 --- a/vtkm/interop/internal/testing/UnitTestOpenGLHeaders.cxx +++ b/vtkm/interop/internal/testing/UnitTestOpenGLHeaders.cxx @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#include #include +#include namespace { void TestOpenGLHeaders() diff --git a/vtkm/interop/testing/UnitTestTransferEGL.cxx b/vtkm/interop/testing/UnitTestTransferEGL.cxx index f3b706274..7d173c188 100644 --- a/vtkm/interop/testing/UnitTestTransferEGL.cxx +++ b/vtkm/interop/testing/UnitTestTransferEGL.cxx @@ -21,9 +21,9 @@ //This sets up testing with the default device adapter and array container -#include #include #include +#include int UnitTestTransferEGL(int, char *[]) { diff --git a/vtkm/interop/testing/UnitTestTransferGLUT.cxx b/vtkm/interop/testing/UnitTestTransferGLUT.cxx index 330059252..df40dce7e 100644 --- a/vtkm/interop/testing/UnitTestTransferGLUT.cxx +++ b/vtkm/interop/testing/UnitTestTransferGLUT.cxx @@ -84,8 +84,8 @@ // // So that is the explanation on why we have the following function which is // used once, doesn't look to be useful and seems very crazy. -#include #include +#include #define VTKM_NVIDIA_PTHREAD_WORKAROUND 1 static int vtkm_force_linking_to_pthread_to_fix_nvidia_libgl_bug() { return static_cast(pthread_self()); } diff --git a/vtkm/interop/testing/UnitTestTransferOSMesa.cxx b/vtkm/interop/testing/UnitTestTransferOSMesa.cxx index d0f51316c..3429848c6 100644 --- a/vtkm/interop/testing/UnitTestTransferOSMesa.cxx +++ b/vtkm/interop/testing/UnitTestTransferOSMesa.cxx @@ -21,9 +21,9 @@ //This sets up testing with the default device adapter and array container -#include #include #include +#include int UnitTestTransferOSMesa(int, char *[]) { diff --git a/vtkm/io/reader/VTKDataSetReader.h b/vtkm/io/reader/VTKDataSetReader.h index 550111217..525c51d9b 100644 --- a/vtkm/io/reader/VTKDataSetReader.h +++ b/vtkm/io/reader/VTKDataSetReader.h @@ -21,10 +21,10 @@ #define vtk_m_io_reader_VTKDataSetReader_h #include -#include +#include #include #include -#include +#include #include #include diff --git a/vtkm/io/reader/VTKDataSetReaderBase.h b/vtkm/io/reader/VTKDataSetReaderBase.h index 0187af4d4..8fc3ddd4a 100644 --- a/vtkm/io/reader/VTKDataSetReaderBase.h +++ b/vtkm/io/reader/VTKDataSetReaderBase.h @@ -28,9 +28,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/vtkm/io/reader/testing/UnitTestVTKDataSetReader.cxx b/vtkm/io/reader/testing/UnitTestVTKDataSetReader.cxx index d41f436ab..f7cf06189 100644 --- a/vtkm/io/reader/testing/UnitTestVTKDataSetReader.cxx +++ b/vtkm/io/reader/testing/UnitTestVTKDataSetReader.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include diff --git a/vtkm/io/writer/VTKDataSetWriter.h b/vtkm/io/writer/VTKDataSetWriter.h index de0891918..fc7ff73ec 100644 --- a/vtkm/io/writer/VTKDataSetWriter.h +++ b/vtkm/io/writer/VTKDataSetWriter.h @@ -23,8 +23,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx b/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx index abe8ea622..7b8c6ec15 100644 --- a/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx +++ b/vtkm/io/writer/testing/UnitTestVTKDataSetWriter.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace { diff --git a/vtkm/rendering/AxisAnnotation2D.h b/vtkm/rendering/AxisAnnotation2D.h index 2aa07156c..1b75a9b27 100644 --- a/vtkm/rendering/AxisAnnotation2D.h +++ b/vtkm/rendering/AxisAnnotation2D.h @@ -28,8 +28,8 @@ #include #include #include -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/AxisAnnotation3D.h b/vtkm/rendering/AxisAnnotation3D.h index cc6275d2c..1ea9fa17c 100644 --- a/vtkm/rendering/AxisAnnotation3D.h +++ b/vtkm/rendering/AxisAnnotation3D.h @@ -28,12 +28,12 @@ #endif #include +#include #include #include #include -#include -#include #include +#include #include diff --git a/vtkm/rendering/Camera.h b/vtkm/rendering/Camera.h index 19d86e6f1..949193420 100644 --- a/vtkm/rendering/Camera.h +++ b/vtkm/rendering/Camera.h @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/vtkm/rendering/Canvas.cxx b/vtkm/rendering/Canvas.cxx index 38f62ccff..ddfde9b87 100644 --- a/vtkm/rendering/Canvas.cxx +++ b/vtkm/rendering/Canvas.cxx @@ -20,8 +20,8 @@ #include -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/CanvasGL.cxx b/vtkm/rendering/CanvasGL.cxx index 2d349d8d1..ceba7d971 100644 --- a/vtkm/rendering/CanvasGL.cxx +++ b/vtkm/rendering/CanvasGL.cxx @@ -20,10 +20,10 @@ #include +#include #include #include #include -#include #include #include #include diff --git a/vtkm/rendering/CanvasRayTracer.cxx b/vtkm/rendering/CanvasRayTracer.cxx index 721a074c1..24abbca07 100644 --- a/vtkm/rendering/CanvasRayTracer.cxx +++ b/vtkm/rendering/CanvasRayTracer.cxx @@ -24,8 +24,8 @@ #include #include #include -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/ColorTable.h b/vtkm/rendering/ColorTable.h index d1e1fa7ff..70a5387aa 100644 --- a/vtkm/rendering/ColorTable.h +++ b/vtkm/rendering/ColorTable.h @@ -21,8 +21,8 @@ #define vtk_m_rendering_ColorTable_h #include -#include #include +#include #include diff --git a/vtkm/rendering/MapperGL.cxx b/vtkm/rendering/MapperGL.cxx index 8411465fb..f614f0576 100644 --- a/vtkm/rendering/MapperGL.cxx +++ b/vtkm/rendering/MapperGL.cxx @@ -20,12 +20,12 @@ #include +#include #include #include #include #include #include -#include #include diff --git a/vtkm/rendering/MapperGL.h b/vtkm/rendering/MapperGL.h index 1cb99a0bf..33f2ecaec 100644 --- a/vtkm/rendering/MapperGL.h +++ b/vtkm/rendering/MapperGL.h @@ -22,9 +22,9 @@ #include #include +#include #include #include -#include #include diff --git a/vtkm/rendering/MapperRayTracer.cxx b/vtkm/rendering/MapperRayTracer.cxx index 5e16d485c..38610577d 100644 --- a/vtkm/rendering/MapperRayTracer.cxx +++ b/vtkm/rendering/MapperRayTracer.cxx @@ -25,8 +25,8 @@ #include #include -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/MapperRayTracer.h b/vtkm/rendering/MapperRayTracer.h index a61a547f9..b7bf8d219 100644 --- a/vtkm/rendering/MapperRayTracer.h +++ b/vtkm/rendering/MapperRayTracer.h @@ -20,9 +20,9 @@ #ifndef vtk_m_rendering_MapperRayTracer_h #define vtk_m_rendering_MapperRayTracer_h +#include #include #include -#include #include diff --git a/vtkm/rendering/View1D.cxx b/vtkm/rendering/View1D.cxx index ff0a224be..6a7dc5f68 100644 --- a/vtkm/rendering/View1D.cxx +++ b/vtkm/rendering/View1D.cxx @@ -18,9 +18,9 @@ // this software. //============================================================================ -#include #include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/View1D.h b/vtkm/rendering/View1D.h index 24d71da4f..1e6fd939b 100644 --- a/vtkm/rendering/View1D.h +++ b/vtkm/rendering/View1D.h @@ -20,8 +20,8 @@ #ifndef vtk_m_rendering_View1D_h #define vtk_m_rendering_View1D_h -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/internal/OpenGLHeaders.h b/vtkm/rendering/internal/OpenGLHeaders.h index b51220a1f..d60684a0d 100644 --- a/vtkm/rendering/internal/OpenGLHeaders.h +++ b/vtkm/rendering/internal/OpenGLHeaders.h @@ -24,9 +24,9 @@ #include #include + #if defined(__APPLE__) # include - #else # include #endif diff --git a/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h b/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h index a4a332d56..e8a09030e 100644 --- a/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h +++ b/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h @@ -20,24 +20,24 @@ #ifndef vtk_m_worklet_BoundingVolumeHierachy_h #define vtk_m_worklet_BoundingVolumeHierachy_h #include +#include #include +#include #include #include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include #include #include -#include -#include -#include -#include #include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/raytracing/RayTracer.h b/vtkm/rendering/raytracing/RayTracer.h index 81d696ed2..d377abfe3 100644 --- a/vtkm/rendering/raytracing/RayTracer.h +++ b/vtkm/rendering/raytracing/RayTracer.h @@ -19,16 +19,16 @@ //============================================================================ #ifndef vtk_m_rendering_raytracing_RayTracer_h #define vtk_m_rendering_raytracing_RayTracer_h -#include #include +#include #include #include #include #include #include #include -#include #include +#include namespace vtkm { diff --git a/vtkm/rendering/raytracing/RayTracingTypeDefs.h b/vtkm/rendering/raytracing/RayTracingTypeDefs.h index b108dc560..57a98b169 100644 --- a/vtkm/rendering/raytracing/RayTracingTypeDefs.h +++ b/vtkm/rendering/raytracing/RayTracingTypeDefs.h @@ -19,8 +19,8 @@ //============================================================================ #ifndef vtk_m_rendering_raytracing_RayTracingTypeDefs_h #define vtk_m_rendering_raytracing_RayTracingTypeDefs_h -#include #include +#include namespace vtkm { namespace rendering { namespace raytracing { diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h index 00af35158..001fb162f 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.h +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h @@ -22,8 +22,8 @@ #ifndef vtk_m_rendering_raytracing_VolumeRendererStructured_h #define vtk_m_rendering_raytracing_VolumeRendererStructured_h -#include #include +#include #include #include #include @@ -31,11 +31,11 @@ #include #include #include -#include #include +#include #include -#include #include +#include namespace vtkm { namespace rendering{ diff --git a/vtkm/rendering/testing/RenderTest.h b/vtkm/rendering/testing/RenderTest.h index 56b47914a..6dcf8b224 100644 --- a/vtkm/rendering/testing/RenderTest.h +++ b/vtkm/rendering/testing/RenderTest.h @@ -21,6 +21,7 @@ #define vtk_m_rendering_testing_RenderTest_h #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx b/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx index af7b85f7a..072287699 100644 --- a/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx +++ b/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx @@ -18,14 +18,14 @@ // this software. //============================================================================ +#include #include +#include #include #include #include #include #include -#include -#include #include namespace { diff --git a/vtkm/rendering/testing/UnitTestMapperVolume.cxx b/vtkm/rendering/testing/UnitTestMapperVolume.cxx index a62cc4ecb..a792a74ae 100644 --- a/vtkm/rendering/testing/UnitTestMapperVolume.cxx +++ b/vtkm/rendering/testing/UnitTestMapperVolume.cxx @@ -18,15 +18,15 @@ // this software. //============================================================================ +#include #include +#include #include #include #include #include #include #include -#include -#include #include namespace { diff --git a/vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx b/vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx index 48935bb6f..ae4b6209b 100644 --- a/vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx +++ b/vtkm/rendering/testing/egl/UnitTestMapperEGL.cxx @@ -18,16 +18,16 @@ // this software. //============================================================================ #include +#include #include +#include #include #include +#include #include #include #include #include -#include -#include -#include #include namespace { diff --git a/vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx b/vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx index 72b5d34dc..c8ef0afe9 100644 --- a/vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx +++ b/vtkm/rendering/testing/glfw/UnitTestMapperGLFW.cxx @@ -17,21 +17,21 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ +#include +#include +#include #include +#include #include +#include #include #include +#include #include -#include #include #include #include -#include -#include #include -#include -#include -#include namespace { static const vtkm::Id WIDTH = 512, HEIGHT = 512; diff --git a/vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx b/vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx index 2cb216267..04707c7f1 100644 --- a/vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx +++ b/vtkm/rendering/testing/glut/UnitTestMapperGLUT.cxx @@ -25,15 +25,15 @@ #else # include #endif +#include +#include +#include #include #include #include #include #include -#include -#include #include -#include namespace { static const vtkm::Id WIDTH = 512, HEIGHT = 512; diff --git a/vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx b/vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx index b5fef58d6..378020897 100644 --- a/vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx +++ b/vtkm/rendering/testing/osmesa/UnitTestMapperOSMesa.cxx @@ -18,15 +18,15 @@ // this software. //============================================================================ #include +#include #include +#include #include #include #include #include #include #include -#include -#include #include namespace { diff --git a/vtkm/testing/Testing.h b/vtkm/testing/Testing.h index f86f17643..decca02d4 100644 --- a/vtkm/testing/Testing.h +++ b/vtkm/testing/Testing.h @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/vtkm/worklet/AverageByKey.h b/vtkm/worklet/AverageByKey.h index 68e2de7bd..79d5fc563 100644 --- a/vtkm/worklet/AverageByKey.h +++ b/vtkm/worklet/AverageByKey.h @@ -23,12 +23,12 @@ #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/vtkm/worklet/ContourTreeUniform.h b/vtkm/worklet/ContourTreeUniform.h index b0cf283ec..4936f59fb 100644 --- a/vtkm/worklet/ContourTreeUniform.h +++ b/vtkm/worklet/ContourTreeUniform.h @@ -71,16 +71,16 @@ #include #include #include -#include -#include #include #include +#include +#include -#include -#include -#include #include #include +#include +#include +#include #ifndef VTKM_DEVICE_ADAPTER #define VTKM_DEVICE_ADAPTER VTKM_DEVICE_ADAPTER_SERIAL diff --git a/vtkm/worklet/DispatcherStreamingMapField.h b/vtkm/worklet/DispatcherStreamingMapField.h index 551d10530..4a981c857 100644 --- a/vtkm/worklet/DispatcherStreamingMapField.h +++ b/vtkm/worklet/DispatcherStreamingMapField.h @@ -20,10 +20,10 @@ #ifndef vtk_m_worklet_Dispatcher_Streaming_MapField_h #define vtk_m_worklet_Dispatcher_Streaming_MapField_h +#include #include #include #include -#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/ExternalFaces.h b/vtkm/worklet/ExternalFaces.h index dfc9d3c4d..3fce36464 100644 --- a/vtkm/worklet/ExternalFaces.h +++ b/vtkm/worklet/ExternalFaces.h @@ -27,9 +27,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/vtkm/worklet/ExtractGeometry.h b/vtkm/worklet/ExtractGeometry.h index d7c502bc1..5acaecb1c 100644 --- a/vtkm/worklet/ExtractGeometry.h +++ b/vtkm/worklet/ExtractGeometry.h @@ -20,13 +20,13 @@ #ifndef vtkm_m_worklet_ExtractGeometry_h #define vtkm_m_worklet_ExtractGeometry_h -#include #include +#include -#include -#include #include +#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/ExtractPoints.h b/vtkm/worklet/ExtractPoints.h index 68ad05fc6..524315934 100644 --- a/vtkm/worklet/ExtractPoints.h +++ b/vtkm/worklet/ExtractPoints.h @@ -20,12 +20,12 @@ #ifndef vtkm_m_worklet_ExtractPoints_h #define vtkm_m_worklet_ExtractPoints_h -#include #include +#include -#include #include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/ExtractStructured.h b/vtkm/worklet/ExtractStructured.h index 97fdb6d37..520b59c75 100644 --- a/vtkm/worklet/ExtractStructured.h +++ b/vtkm/worklet/ExtractStructured.h @@ -31,9 +31,9 @@ #include #include +#include #include #include -#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/FieldHistogram.h b/vtkm/worklet/FieldHistogram.h index 728e6d7f6..45fdccd61 100644 --- a/vtkm/worklet/FieldHistogram.h +++ b/vtkm/worklet/FieldHistogram.h @@ -24,9 +24,9 @@ #include #include #include +#include #include #include -#include #include diff --git a/vtkm/worklet/FieldStatistics.h b/vtkm/worklet/FieldStatistics.h index bcafc2b63..fe19d8be4 100644 --- a/vtkm/worklet/FieldStatistics.h +++ b/vtkm/worklet/FieldStatistics.h @@ -23,9 +23,9 @@ #include #include +#include #include #include -#include #include diff --git a/vtkm/worklet/Gradient.h b/vtkm/worklet/Gradient.h index ea60b505a..5974758e3 100644 --- a/vtkm/worklet/Gradient.h +++ b/vtkm/worklet/Gradient.h @@ -21,12 +21,12 @@ #ifndef vtk_m_worklet_Gradient_h #define vtk_m_worklet_Gradient_h -#include -#include -#include #include #include #include +#include +#include +#include #include #include diff --git a/vtkm/worklet/KernelSplatter.h b/vtkm/worklet/KernelSplatter.h index 4ef544542..ab4dd531e 100644 --- a/vtkm/worklet/KernelSplatter.h +++ b/vtkm/worklet/KernelSplatter.h @@ -27,19 +27,19 @@ #include #include #include -#include -#include -#include #include #include +#include +#include #include +#include #include #include #include -#include #include +#include #include #define __VTKM_GAUSSIAN_SPLATTER_BENCHMARK diff --git a/vtkm/worklet/MarchingCubes.h b/vtkm/worklet/MarchingCubes.h index 1bc21dc70..2c3045d55 100644 --- a/vtkm/worklet/MarchingCubes.h +++ b/vtkm/worklet/MarchingCubes.h @@ -21,8 +21,8 @@ #ifndef vtk_m_worklet_MarchingCubes_h #define vtk_m_worklet_MarchingCubes_h -#include #include +#include #include #include diff --git a/vtkm/worklet/Mask.h b/vtkm/worklet/Mask.h index 664228c3e..eb31fae05 100644 --- a/vtkm/worklet/Mask.h +++ b/vtkm/worklet/Mask.h @@ -23,11 +23,11 @@ #include #include -#include -#include #include #include #include +#include +#include #include namespace vtkm { diff --git a/vtkm/worklet/MaskPoints.h b/vtkm/worklet/MaskPoints.h index 5e9b900cc..732ad893a 100644 --- a/vtkm/worklet/MaskPoints.h +++ b/vtkm/worklet/MaskPoints.h @@ -20,9 +20,9 @@ #ifndef vtkm_m_worklet_MaskPoints_h #define vtkm_m_worklet_MaskPoints_h -#include #include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/StreamLineUniformGrid.h b/vtkm/worklet/StreamLineUniformGrid.h index b1b5766bb..b2cdf87f1 100644 --- a/vtkm/worklet/StreamLineUniformGrid.h +++ b/vtkm/worklet/StreamLineUniformGrid.h @@ -21,12 +21,12 @@ #ifndef vtk_m_worklet_StreamLineUniformGrid_h #define vtk_m_worklet_StreamLineUniformGrid_h -#include #include #include -#include -#include #include +#include +#include +#include #include #include diff --git a/vtkm/worklet/ThresholdPoints.h b/vtkm/worklet/ThresholdPoints.h index d36b7be81..73e7df94f 100644 --- a/vtkm/worklet/ThresholdPoints.h +++ b/vtkm/worklet/ThresholdPoints.h @@ -23,8 +23,8 @@ #include #include -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/WorkletMapTopology.h b/vtkm/worklet/WorkletMapTopology.h index 7d6394d37..69bba540a 100644 --- a/vtkm/worklet/WorkletMapTopology.h +++ b/vtkm/worklet/WorkletMapTopology.h @@ -22,8 +22,8 @@ #include -#include #include +#include #include #include @@ -37,8 +37,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/vtkm/worklet/contourtree/ActiveEdgeTransferrer.h b/vtkm/worklet/contourtree/ActiveEdgeTransferrer.h index 784795148..cc8d4fe49 100644 --- a/vtkm/worklet/contourtree/ActiveEdgeTransferrer.h +++ b/vtkm/worklet/contourtree/ActiveEdgeTransferrer.h @@ -84,8 +84,8 @@ #ifndef vtk_m_worklet_contourtree_active_edge_transferrer_h #define vtk_m_worklet_contourtree_active_edge_transferrer_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/ChainDoubler.h b/vtkm/worklet/contourtree/ChainDoubler.h index b730034bd..c12f7a367 100644 --- a/vtkm/worklet/contourtree/ChainDoubler.h +++ b/vtkm/worklet/contourtree/ChainDoubler.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_chain_doubler_h #define vtkm_worklet_contourtree_chain_doubler_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/ChainGraph.h b/vtkm/worklet/contourtree/ChainGraph.h index c5ccbc8e7..18c7a7536 100644 --- a/vtkm/worklet/contourtree/ChainGraph.h +++ b/vtkm/worklet/contourtree/ChainGraph.h @@ -81,17 +81,17 @@ #ifndef vtkm_worklet_contourtree_chaingraph_h #define vtkm_worklet_contourtree_chaingraph_h -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/vtkm/worklet/contourtree/ContourTree.h b/vtkm/worklet/contourtree/ContourTree.h index 6efb4147b..4e74c344e 100644 --- a/vtkm/worklet/contourtree/ContourTree.h +++ b/vtkm/worklet/contourtree/ContourTree.h @@ -131,32 +131,32 @@ #define vtkm_worklet_contourtree_contourtree_h // local includes -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include +#include +#include #include -#include -#include #include #define DEBUG_PRINT 1 diff --git a/vtkm/worklet/contourtree/CopyJoinSplit.h b/vtkm/worklet/contourtree/CopyJoinSplit.h index abbbea8da..b94c11069 100644 --- a/vtkm/worklet/contourtree/CopyJoinSplit.h +++ b/vtkm/worklet/contourtree/CopyJoinSplit.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_copy_join_split_h #define vtkm_worklet_contourtree_copy_join_split_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/CopyNeighbors.h b/vtkm/worklet/contourtree/CopyNeighbors.h index a8f6b5b64..970042a13 100644 --- a/vtkm/worklet/contourtree/CopyNeighbors.h +++ b/vtkm/worklet/contourtree/CopyNeighbors.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_copy_neighbors_h #define vtkm_worklet_contourtree_copy_neighbors_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/CopySupernodes.h b/vtkm/worklet/contourtree/CopySupernodes.h index 32154f4f9..0209ef888 100644 --- a/vtkm/worklet/contourtree/CopySupernodes.h +++ b/vtkm/worklet/contourtree/CopySupernodes.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_copy_supernodes_h #define vtkm_worklet_contourtree_copy_supernodes_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/DegreeDelta.h b/vtkm/worklet/contourtree/DegreeDelta.h index 1853502be..7ee0049a9 100644 --- a/vtkm/worklet/contourtree/DegreeDelta.h +++ b/vtkm/worklet/contourtree/DegreeDelta.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_degree_delta_h #define vtkm_worklet_contourtree_degree_delta_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/DegreeSubrangeOffset.h b/vtkm/worklet/contourtree/DegreeSubrangeOffset.h index 7478d3f42..1a2ea93fe 100644 --- a/vtkm/worklet/contourtree/DegreeSubrangeOffset.h +++ b/vtkm/worklet/contourtree/DegreeSubrangeOffset.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_degree_subrange_offset_h #define vtkm_worklet_contourtree_degree_subrange_offset_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/FillSupernodes.h b/vtkm/worklet/contourtree/FillSupernodes.h index 4210c26e4..5d74ab227 100644 --- a/vtkm/worklet/contourtree/FillSupernodes.h +++ b/vtkm/worklet/contourtree/FillSupernodes.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_fill_supernodes_h #define vtkm_worklet_contourtree_fill_supernodes_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/FindLeaves.h b/vtkm/worklet/contourtree/FindLeaves.h index 5cdfcced8..c992b73fc 100644 --- a/vtkm/worklet/contourtree/FindLeaves.h +++ b/vtkm/worklet/contourtree/FindLeaves.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_find_leaves_h #define vtkm_worklet_contourtree_find_leaves_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/GoverningSaddleFinder.h b/vtkm/worklet/contourtree/GoverningSaddleFinder.h index c4aafec9d..a67782d95 100644 --- a/vtkm/worklet/contourtree/GoverningSaddleFinder.h +++ b/vtkm/worklet/contourtree/GoverningSaddleFinder.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_governing_saddle_finder_h #define vtkm_worklet_contourtree_governing_saddle_finder_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/JoinArcConnector.h b/vtkm/worklet/contourtree/JoinArcConnector.h index 859eb354f..ffa999b19 100644 --- a/vtkm/worklet/contourtree/JoinArcConnector.h +++ b/vtkm/worklet/contourtree/JoinArcConnector.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_join_arc_connector_h #define vtkm_worklet_contourtree_join_arc_connector_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/JoinSuperArcFinder.h b/vtkm/worklet/contourtree/JoinSuperArcFinder.h index c6cb99692..16808373d 100644 --- a/vtkm/worklet/contourtree/JoinSuperArcFinder.h +++ b/vtkm/worklet/contourtree/JoinSuperArcFinder.h @@ -87,10 +87,10 @@ #ifndef vtkm_worklet_contourtree_join_super_arc_finder_h #define vtkm_worklet_contourtree_join_super_arc_finder_h -#include -#include #include "vtkm/worklet/contourtree/Types.h" #include "vtkm/worklet/contourtree/VertexValueComparator.h" +#include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/JoinTreeTransferrer.h b/vtkm/worklet/contourtree/JoinTreeTransferrer.h index 68167bee3..2f7607861 100644 --- a/vtkm/worklet/contourtree/JoinTreeTransferrer.h +++ b/vtkm/worklet/contourtree/JoinTreeTransferrer.h @@ -84,8 +84,8 @@ #ifndef vtkm_worklet_contourtree_join_tree_transferrer_h #define vtkm_worklet_contourtree_join_tree_transferrer_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/MergeTree.h b/vtkm/worklet/contourtree/MergeTree.h index aad73699e..e07adca9c 100644 --- a/vtkm/worklet/contourtree/MergeTree.h +++ b/vtkm/worklet/contourtree/MergeTree.h @@ -113,10 +113,10 @@ #include #include -#include #include -#include #include +#include +#include #include //#define DEBUG_PRINT 1 diff --git a/vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h b/vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h index 141073f6f..77d78f89f 100644 --- a/vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h +++ b/vtkm/worklet/contourtree/Mesh2D_DEM_SaddleStarter.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_mesh2d_dem_saddle_starter_h #define vtkm_worklet_contourtree_mesh2d_dem_saddle_starter_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation.h b/vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation.h index 23ddef7bf..0a7158037 100644 --- a/vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation.h +++ b/vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation.h @@ -83,17 +83,17 @@ #ifndef vtkm_worklet_contourtree_mesh2d_dem_triangulation_h #define vtkm_worklet_contourtree_mesh2d_dem_triangulation_h -#include #include +#include #include #include -#include #include -#include -#include -#include #include +#include +#include +#include +#include #define DEBUG_PRINT 1 //#define DEBUG_TIMING 1 diff --git a/vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h b/vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h index 6860dca37..564c080e5 100644 --- a/vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h +++ b/vtkm/worklet/contourtree/Mesh2D_DEM_VertexOutdegreeStarter.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_mesh2d_dem_vertex_outdegree_starter_h #define vtkm_worklet_contourtree_mesh2d_dem_vertex_outdegree_starter_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h b/vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h index 99b332075..f7cda9788 100644 --- a/vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h +++ b/vtkm/worklet/contourtree/Mesh2D_DEM_VertexStarter.h @@ -83,8 +83,8 @@ #ifndef vtkm_worklet_contourtree_mesh2d_dem_vertex_starter_h #define vtkm_worklet_contourtree_mesh2d_dem_vertex_starter_h -#include #include +#include #include #include diff --git a/vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h b/vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h index 66234bc4c..98735f6a1 100644 --- a/vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h +++ b/vtkm/worklet/contourtree/Mesh3D_DEM_SaddleStarter.h @@ -83,10 +83,10 @@ #ifndef vtkm_worklet_contourtree_mesh3d_dem_saddle_starter_h #define vtkm_worklet_contourtree_mesh3d_dem_saddle_starter_h -#include #include -#include +#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/Mesh3D_DEM_Triangulation.h b/vtkm/worklet/contourtree/Mesh3D_DEM_Triangulation.h index 43dfc9b4d..894bd22ad 100644 --- a/vtkm/worklet/contourtree/Mesh3D_DEM_Triangulation.h +++ b/vtkm/worklet/contourtree/Mesh3D_DEM_Triangulation.h @@ -84,18 +84,18 @@ #define vtkm_worklet_contourtree_mesh3d_dem_triangulation_h #include -#include #include +#include #include #include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #define DEBUG_PRINT 1 //#define DEBUG_TIMING 1 diff --git a/vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h b/vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h index 7193833b8..6cf5f185a 100644 --- a/vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h +++ b/vtkm/worklet/contourtree/Mesh3D_DEM_VertexOutdegreeStarter.h @@ -83,10 +83,10 @@ #ifndef vtkm_worklet_contourtree_mesh3d_dem_vertex_outdegree_starter_h #define vtkm_worklet_contourtree_mesh3d_dem_vertex_outdegree_starter_h -#include #include -#include +#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h b/vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h index afa4c53ba..f7aa2d999 100644 --- a/vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h +++ b/vtkm/worklet/contourtree/Mesh3D_DEM_VertexStarter.h @@ -83,11 +83,11 @@ #ifndef vtkm_worklet_contourtree_mesh3d_dem_vertex_starter_h #define vtkm_worklet_contourtree_mesh3d_dem_vertex_starter_h -#include +#include #include +#include #include #include -#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/PrintVectors.h b/vtkm/worklet/contourtree/PrintVectors.h index f9f74a77e..b53029661 100644 --- a/vtkm/worklet/contourtree/PrintVectors.h +++ b/vtkm/worklet/contourtree/PrintVectors.h @@ -67,10 +67,10 @@ #ifndef vtkm_worklet_contourtree_print_vector_h #define vtkm_worklet_contourtree_print_vector_h -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/vtkm/worklet/contourtree/RegularPointTransferrer.h b/vtkm/worklet/contourtree/RegularPointTransferrer.h index 1ad8e8059..8e2054f82 100644 --- a/vtkm/worklet/contourtree/RegularPointTransferrer.h +++ b/vtkm/worklet/contourtree/RegularPointTransferrer.h @@ -83,11 +83,11 @@ #ifndef vtkm_worklet_contourtree_regular_point_transferrer_h #define vtkm_worklet_contourtree_regular_point_transferrer_h -#include -#include #include "vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h" -#include "vtkm/worklet/contourtree/VertexValueComparator.h" #include "vtkm/worklet/contourtree/Types.h" +#include "vtkm/worklet/contourtree/VertexValueComparator.h" +#include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/RegularToCandidate.h b/vtkm/worklet/contourtree/RegularToCandidate.h index a7598bc4e..87c68aadd 100644 --- a/vtkm/worklet/contourtree/RegularToCandidate.h +++ b/vtkm/worklet/contourtree/RegularToCandidate.h @@ -67,9 +67,9 @@ #ifndef vtkm_worklet_contourtree_regular_to_candidate_h #define vtkm_worklet_contourtree_regular_to_candidate_h -#include -#include #include "vtkm/worklet/contourtree/Types.h" +#include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/RegularToCriticalDown.h b/vtkm/worklet/contourtree/RegularToCriticalDown.h index b82ea9005..604146114 100644 --- a/vtkm/worklet/contourtree/RegularToCriticalDown.h +++ b/vtkm/worklet/contourtree/RegularToCriticalDown.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_regular_to_critical_down_h #define vtkm_worklet_contourtree_regular_to_critical_down_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/RegularToCriticalUp.h b/vtkm/worklet/contourtree/RegularToCriticalUp.h index 1d55fe1e1..a8c334ff5 100644 --- a/vtkm/worklet/contourtree/RegularToCriticalUp.h +++ b/vtkm/worklet/contourtree/RegularToCriticalUp.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_regular_to_critical_up_h #define vtkm_worklet_contourtree_regular_to_critical_up_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/ResetDegrees.h b/vtkm/worklet/contourtree/ResetDegrees.h index 5e17c0afa..c3707b080 100644 --- a/vtkm/worklet/contourtree/ResetDegrees.h +++ b/vtkm/worklet/contourtree/ResetDegrees.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_reset_degrees_h #define vtkm_worklet_contourtree_reset_degrees_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/SaddleAscentFunctor.h b/vtkm/worklet/contourtree/SaddleAscentFunctor.h index 3cc48cba6..bdf38e91a 100644 --- a/vtkm/worklet/contourtree/SaddleAscentFunctor.h +++ b/vtkm/worklet/contourtree/SaddleAscentFunctor.h @@ -80,8 +80,8 @@ #ifndef vtkm_worklet_contourtree_saddle_ascent_functor_h #define vtkm_worklet_contourtree_saddle_ascent_functor_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/SaddleAscentTransferrer.h b/vtkm/worklet/contourtree/SaddleAscentTransferrer.h index d04afdbb0..96d48cbf2 100644 --- a/vtkm/worklet/contourtree/SaddleAscentTransferrer.h +++ b/vtkm/worklet/contourtree/SaddleAscentTransferrer.h @@ -80,8 +80,8 @@ #ifndef vtkm_worklet_contourtree_saddle_ascent_transferrer_h #define vtkm_worklet_contourtree_saddle_ascent_transferrer_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/SetJoinAndSplitArcs.h b/vtkm/worklet/contourtree/SetJoinAndSplitArcs.h index bbd0fea3d..faebe11a9 100644 --- a/vtkm/worklet/contourtree/SetJoinAndSplitArcs.h +++ b/vtkm/worklet/contourtree/SetJoinAndSplitArcs.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_set_join_and_split_arcs_h #define vtkm_worklet_contourtree_set_join_and_split_arcs_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/SetSupernodeInward.h b/vtkm/worklet/contourtree/SetSupernodeInward.h index a2147e38b..367b6ce6f 100644 --- a/vtkm/worklet/contourtree/SetSupernodeInward.h +++ b/vtkm/worklet/contourtree/SetSupernodeInward.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_set_supernode_inward_h #define vtkm_worklet_contourtree_set_supernode_inward_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/SkipVertex.h b/vtkm/worklet/contourtree/SkipVertex.h index 01343f1fa..498c9549a 100644 --- a/vtkm/worklet/contourtree/SkipVertex.h +++ b/vtkm/worklet/contourtree/SkipVertex.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_skip_vertex_h #define vtkm_worklet_contourtree_skip_vertex_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/SubrangeOffset.h b/vtkm/worklet/contourtree/SubrangeOffset.h index 789561fc1..58515a471 100644 --- a/vtkm/worklet/contourtree/SubrangeOffset.h +++ b/vtkm/worklet/contourtree/SubrangeOffset.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_subrange_offset_h #define vtkm_worklet_contourtree_subrange_offset_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/contourtree/TrunkBuilder.h b/vtkm/worklet/contourtree/TrunkBuilder.h index b78ee7dd1..524c29b12 100644 --- a/vtkm/worklet/contourtree/TrunkBuilder.h +++ b/vtkm/worklet/contourtree/TrunkBuilder.h @@ -84,8 +84,8 @@ #ifndef vtkm_worklet_contourtree_trunk_builder_h #define vtkm_worklet_contourtree_trunk_builder_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/UpdateOutbound.h b/vtkm/worklet/contourtree/UpdateOutbound.h index a4ce1907a..d4a3e33a7 100644 --- a/vtkm/worklet/contourtree/UpdateOutbound.h +++ b/vtkm/worklet/contourtree/UpdateOutbound.h @@ -67,8 +67,8 @@ #ifndef vtkm_worklet_contourtree_update_outbound_h #define vtkm_worklet_contourtree_update_outbound_h -#include #include +#include #include namespace vtkm { diff --git a/vtkm/worklet/contourtree/VertexDegreeUpdater.h b/vtkm/worklet/contourtree/VertexDegreeUpdater.h index 0d4cb3912..df6516060 100644 --- a/vtkm/worklet/contourtree/VertexDegreeUpdater.h +++ b/vtkm/worklet/contourtree/VertexDegreeUpdater.h @@ -84,8 +84,8 @@ #ifndef vtkm_worklet_contourtree_vertex_degree_updater_h #define vtkm_worklet_contourtree_vertex_degree_updater_h -#include #include +#include namespace vtkm { namespace worklet { diff --git a/vtkm/worklet/internal/WorkletBase.h b/vtkm/worklet/internal/WorkletBase.h index b38224d95..cbec648e6 100644 --- a/vtkm/worklet/internal/WorkletBase.h +++ b/vtkm/worklet/internal/WorkletBase.h @@ -20,8 +20,8 @@ #ifndef vtk_m_worklet_internal_WorkletBase_h #define vtk_m_worklet_internal_WorkletBase_h -#include #include +#include #include #include @@ -43,8 +43,8 @@ #include #include #include -#include #include +#include #include diff --git a/vtkm/worklet/testing/UnitTestCellAverage.cxx b/vtkm/worklet/testing/UnitTestCellAverage.cxx index cc4229235..a2c53beb4 100644 --- a/vtkm/worklet/testing/UnitTestCellAverage.cxx +++ b/vtkm/worklet/testing/UnitTestCellAverage.cxx @@ -21,8 +21,8 @@ #include #include -#include #include +#include namespace { diff --git a/vtkm/worklet/testing/UnitTestCellGradient.cxx b/vtkm/worklet/testing/UnitTestCellGradient.cxx index 7403ba2da..04a741027 100644 --- a/vtkm/worklet/testing/UnitTestCellGradient.cxx +++ b/vtkm/worklet/testing/UnitTestCellGradient.cxx @@ -18,11 +18,11 @@ // this software. //============================================================================ -#include #include +#include -#include #include +#include namespace { diff --git a/vtkm/worklet/testing/UnitTestExternalFaces.cxx b/vtkm/worklet/testing/UnitTestExternalFaces.cxx index a33a8d1bd..d53e3a5cd 100644 --- a/vtkm/worklet/testing/UnitTestExternalFaces.cxx +++ b/vtkm/worklet/testing/UnitTestExternalFaces.cxx @@ -18,14 +18,14 @@ // this software. //============================================================================ -#include #include +#include #include -#include #include #include +#include #include diff --git a/vtkm/worklet/testing/UnitTestMagnitude.cxx b/vtkm/worklet/testing/UnitTestMagnitude.cxx index d275b00bd..a05df9aa9 100644 --- a/vtkm/worklet/testing/UnitTestMagnitude.cxx +++ b/vtkm/worklet/testing/UnitTestMagnitude.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include diff --git a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx index 69a724480..a2cca600f 100644 --- a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx +++ b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx @@ -25,8 +25,8 @@ #include #include -#include #include +#include namespace { diff --git a/vtkm/worklet/testing/UnitTestPointElevation.cxx b/vtkm/worklet/testing/UnitTestPointElevation.cxx index b9378264e..0173a27c9 100644 --- a/vtkm/worklet/testing/UnitTestPointElevation.cxx +++ b/vtkm/worklet/testing/UnitTestPointElevation.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestPointGradient.cxx b/vtkm/worklet/testing/UnitTestPointGradient.cxx index 31b719bf5..92f22c323 100644 --- a/vtkm/worklet/testing/UnitTestPointGradient.cxx +++ b/vtkm/worklet/testing/UnitTestPointGradient.cxx @@ -18,11 +18,11 @@ // this software. //============================================================================ -#include #include +#include -#include #include +#include namespace { diff --git a/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx b/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx index 2cfa282f4..e4bc8b839 100644 --- a/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx +++ b/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx @@ -18,14 +18,14 @@ // this software. //============================================================================ -#include #include #include #include +#include #include -#include #include +#include namespace { diff --git a/vtkm/worklet/testing/UnitTestStreamingSine.cxx b/vtkm/worklet/testing/UnitTestStreamingSine.cxx index f611e07ab..0eb23bf47 100644 --- a/vtkm/worklet/testing/UnitTestStreamingSine.cxx +++ b/vtkm/worklet/testing/UnitTestStreamingSine.cxx @@ -19,10 +19,10 @@ //============================================================================ #include -#include -#include #include #include +#include +#include #include diff --git a/vtkm/worklet/testing/UnitTestTetrahedralize.cxx b/vtkm/worklet/testing/UnitTestTetrahedralize.cxx index d00f4c86f..aa78bd74f 100644 --- a/vtkm/worklet/testing/UnitTestTetrahedralize.cxx +++ b/vtkm/worklet/testing/UnitTestTetrahedralize.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestTriangulate.cxx b/vtkm/worklet/testing/UnitTestTriangulate.cxx index 832a56c79..67990e834 100644 --- a/vtkm/worklet/testing/UnitTestTriangulate.cxx +++ b/vtkm/worklet/testing/UnitTestTriangulate.cxx @@ -18,8 +18,8 @@ // this software. //============================================================================ -#include #include +#include #include #include diff --git a/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx b/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx index 8185800fe..5609f7dc1 100644 --- a/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx +++ b/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx @@ -20,12 +20,12 @@ #include -#include #include #include +#include -#include #include +#include namespace vtkm { diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx index 23453363d..41daff4dc 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx @@ -28,8 +28,8 @@ #include -#include #include +#include namespace test_explicit { diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx index bd0966f64..243a37c12 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx @@ -28,8 +28,8 @@ #include -#include #include +#include namespace test_uniform { diff --git a/vtkm/worklet/wavelets/WaveletTransforms.h b/vtkm/worklet/wavelets/WaveletTransforms.h index 81cc5a272..a00e60ddc 100644 --- a/vtkm/worklet/wavelets/WaveletTransforms.h +++ b/vtkm/worklet/wavelets/WaveletTransforms.h @@ -21,8 +21,8 @@ #ifndef vtk_m_worklet_Wavelets_h #define vtk_m_worklet_Wavelets_h -#include #include +#include #include