Commit b9e0e541 authored by Robert Maynard's avatar Robert Maynard
Browse files

VTK-m once again uses consistent include style

parent 069923d4
......@@ -420,6 +420,6 @@ VTKM_EXEC_CONT vtkm::Sphere<CoordType, 3> make_SphereFrom4Points(
} // namespace vtkm
#include "vtkm/Geometry.hxx"
#include <vtkm/Geometry.hxx>
#endif // vtk_m_Geometry_h
......@@ -18,7 +18,7 @@
// this software.
//============================================================================
#include "Field.h"
#include <vtkm/cont/Field.h>
namespace vtkm
{
......
......@@ -18,7 +18,7 @@
// this software.
//============================================================================
#define vtk_m_cont_StorageVirtual_cxx
#include "StorageVirtual.h"
#include <vtkm/cont/StorageVirtual.h>
#include <vtkm/cont/internal/DeviceAdapterError.h>
......
......@@ -17,4 +17,4 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#include "DeviceAdapterRuntimeDetectorCuda.cxx"
#include <vtkm/cont/cuda/internal/DeviceAdapterRuntimeDetectorCuda.cxx>
......@@ -20,7 +20,7 @@
#ifndef vtk_m_cont_internal_DynamicTransform_h
#define vtk_m_cont_internal_DynamicTransform_h
#include "vtkm/internal/IndexTag.h"
#include <vtkm/internal/IndexTag.h>
#include <utility>
......
......@@ -18,15 +18,15 @@
// this software.
//============================================================================
#include "vtkm/cont/internal/DynamicTransform.h"
#include <vtkm/cont/internal/DynamicTransform.h>
#include "vtkm/cont/ArrayHandle.h"
#include "vtkm/cont/DynamicCellSet.h"
#include "vtkm/cont/VariantArrayHandle.h"
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/VariantArrayHandle.h>
#include "vtkm/internal/FunctionInterface.h"
#include <vtkm/internal/FunctionInterface.h>
#include "vtkm/cont/testing/Testing.h"
#include <vtkm/cont/testing/Testing.h>
namespace vtkm
{
......
......@@ -23,11 +23,11 @@
* Functions that provide integral measures over cells.
*/
#include "vtkm/CellShape.h"
#include "vtkm/CellTraits.h"
#include "vtkm/VecTraits.h"
#include "vtkm/VectorAnalysis.h"
#include "vtkm/exec/FunctorBase.h"
#include <vtkm/CellShape.h>
#include <vtkm/CellTraits.h>
#include <vtkm/VecTraits.h>
#include <vtkm/VectorAnalysis.h>
#include <vtkm/exec/FunctorBase.h>
namespace vtkm
{
......
......@@ -21,8 +21,8 @@
#ifndef vtk_m_filter_CellMeasures_h
#define vtk_m_filter_CellMeasures_h
#include "vtkm/filter/FilterCell.h"
#include "vtkm/worklet/CellMeasure.h"
#include <vtkm/filter/FilterCell.h>
#include <vtkm/worklet/CellMeasure.h>
namespace vtkm
{
......
......@@ -18,10 +18,10 @@
// this software.
//============================================================================
#include "vtkm/cont/DynamicCellSet.h"
#include "vtkm/cont/ErrorFilterExecution.h"
#include "vtkm/filter/internal/CreateResult.h"
#include "vtkm/worklet/DispatcherMapTopology.h"
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/internal/CreateResult.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
namespace vtkm
{
......
......@@ -20,8 +20,8 @@
#ifndef vtk_m_filter_OscillatorSource_h
#define vtk_m_filter_OscillatorSource_h
#include "vtkm/filter/FilterField.h"
#include "vtkm/worklet/OscillatorSource.h"
#include <vtkm/filter/FilterField.h>
#include <vtkm/worklet/OscillatorSource.h>
namespace vtkm
{
......
......@@ -18,10 +18,10 @@
// this software.
//============================================================================
#include "vtkm/filter/CellMeasures.h"
#include <vtkm/filter/CellMeasures.h>
#include "vtkm/cont/testing/MakeTestDataSet.h"
#include "vtkm/cont/testing/Testing.h"
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vector>
......
......@@ -24,7 +24,7 @@
#include <vtkm/cont/ArrayPortalToIterators.h>
#include "iterator"
#include <iterator>
namespace vtkm
{
......
......@@ -21,9 +21,9 @@
#ifndef vtk_m_worklet_CellMeasure_h
#define vtk_m_worklet_CellMeasure_h
#include "vtkm/worklet/WorkletMapTopology.h"
#include <vtkm/worklet/WorkletMapTopology.h>
#include "vtkm/exec/CellMeasure.h"
#include <vtkm/exec/CellMeasure.h>
namespace vtkm
{
......
......@@ -87,9 +87,9 @@
#ifndef vtkm_worklet_contourtree_join_super_arc_finder_h
#define vtkm_worklet_contourtree_join_super_arc_finder_h
#include "vtkm/worklet/contourtree/Types.h"
#include "vtkm/worklet/contourtree/VertexValueComparator.h"
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree/Types.h>
#include <vtkm/worklet/contourtree/VertexValueComparator.h>
namespace vtkm
{
......
......@@ -83,10 +83,10 @@
#ifndef vtkm_worklet_contourtree_regular_point_transferrer_h
#define vtkm_worklet_contourtree_regular_point_transferrer_h
#include "vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h"
#include "vtkm/worklet/contourtree/Types.h"
#include "vtkm/worklet/contourtree/VertexValueComparator.h"
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree/Mesh2D_DEM_Triangulation_Macros.h>
#include <vtkm/worklet/contourtree/Types.h>
#include <vtkm/worklet/contourtree/VertexValueComparator.h>
namespace vtkm
{
......
......@@ -67,8 +67,8 @@
#ifndef vtkm_worklet_contourtree_regular_to_candidate_h
#define vtkm_worklet_contourtree_regular_to_candidate_h
#include "vtkm/worklet/contourtree/Types.h"
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree/Types.h>
namespace vtkm
{
......
......@@ -72,7 +72,7 @@
#include <vtkm/cont/ArrayHandleTransform.h>
// local includes
#include "Types.h"
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
......
......@@ -69,8 +69,8 @@
#include <iostream>
// local includes
#include "PrintVectors.h"
#include "Types.h"
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
//VTKM includes
#include <vtkm/Pair.h>
......
......@@ -63,7 +63,6 @@
#ifndef vtkm_worklet_contourtree_augmented_contourtreemaker_h
#define vtkm_worklet_contourtree_augmented_contourtreemaker_h
#include "Types.h"
#include <iomanip>
// local includes
......
......@@ -67,8 +67,8 @@
#include <iomanip>
// local includes
#include "PrintVectors.h"
#include "Types.h"
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
//VTKM includes
#include <vtkm/Types.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment