From d5fe4046c51220fda21553d9a2b20544241a0345 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Fri, 6 Dec 2019 21:32:36 -0700 Subject: [PATCH] Remove instances of ListTag in favor of List --- benchmarking/BenchmarkFilters.cxx | 1 - benchmarking/Benchmarker.h | 1 - vtkm/cont/ArrayHandleMultiplexer.h | 1 - vtkm/cont/BitField.h | 2 +- vtkm/cont/DynamicCellSet.h | 8 ++++---- vtkm/cont/RuntimeDeviceInformation.cxx | 4 ++-- vtkm/cont/Timer.h | 4 ++-- vtkm/cont/TryExecute.h | 4 ++-- vtkm/cont/VariantArrayHandle.h | 4 ++-- vtkm/cont/VirtualObjectHandle.h | 2 +- vtkm/cont/VirtualObjectHandle.hxx | 2 +- vtkm/cont/arg/TypeCheckTagArray.h | 2 +- vtkm/cont/internal/DeviceAdapterListHelpers.h | 2 +- vtkm/cont/testing/TestingImplicitFunction.h | 2 +- vtkm/cont/testing/UnitTestStorageList.cxx | 6 +++--- vtkm/cont/testing/UnitTestStorageListTag.cxx | 2 ++ vtkm/cont/testing/UnitTestTimer.cxx | 2 +- vtkm/exec/AtomicArrayExecutionObject.h | 2 +- vtkm/filter/FilterTraits.h | 2 +- vtkm/filter/PolicyBase.h | 6 +++--- vtkm/filter/PolicyExtrude.h | 2 +- vtkm/rendering/raytracing/MeshConnectivityBase.h | 5 ++--- vtkm/rendering/raytracing/RayTracingTypeDefs.h | 4 ++-- vtkm/testing/UnitTestList.cxx | 6 +++--- vtkm/testing/UnitTestTypeList.cxx | 6 +++--- vtkm/testing/UnitTestTypeListTag.cxx | 2 ++ vtkm/worklet/ExtractStructured.h | 2 +- vtkm/worklet/moments/ComputeMoments.h | 2 +- 28 files changed, 44 insertions(+), 44 deletions(-) diff --git a/benchmarking/BenchmarkFilters.cxx b/benchmarking/BenchmarkFilters.cxx index da3e61195..884c8f7b1 100644 --- a/benchmarking/BenchmarkFilters.cxx +++ b/benchmarking/BenchmarkFilters.cxx @@ -10,7 +10,6 @@ #include "Benchmarker.h" -#include #include #include #include diff --git a/benchmarking/Benchmarker.h b/benchmarking/Benchmarker.h index ae437aa7f..d2faadbad 100644 --- a/benchmarking/Benchmarker.h +++ b/benchmarking/Benchmarker.h @@ -11,7 +11,6 @@ #ifndef vtk_m_benchmarking_Benchmarker_h #define vtk_m_benchmarking_Benchmarker_h -#include #include #include #include diff --git a/vtkm/cont/ArrayHandleMultiplexer.h b/vtkm/cont/ArrayHandleMultiplexer.h index 8c644c0bf..bfa9bc760 100644 --- a/vtkm/cont/ArrayHandleMultiplexer.h +++ b/vtkm/cont/ArrayHandleMultiplexer.h @@ -18,7 +18,6 @@ #include #include #include -#include namespace vtkm { diff --git a/vtkm/cont/BitField.h b/vtkm/cont/BitField.h index c12e39b16..75bcaddc7 100644 --- a/vtkm/cont/BitField.h +++ b/vtkm/cont/BitField.h @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h index ad4b376ad..4275dcc55 100644 --- a/vtkm/cont/DynamicCellSet.h +++ b/vtkm/cont/DynamicCellSet.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ namespace cont /// to determine the type when running algorithms. /// /// By default, \c DynamicCellSet will assume that the value type in the array -/// matches one of the types specified by \c VTKM_DEFAULT_CELL_SET_LIST_TAG. +/// matches one of the types specified by \c VTKM_DEFAULT_CELL_SET_LIST. /// This list can be changed by using the \c ResetCellSetList method. It is /// worthwhile to match these lists closely to the possible types that might be /// used. If a type is missing you will get a runtime error. If there are more @@ -127,7 +127,7 @@ public: /// Changes the cell set types to try casting to when resolving this dynamic /// cell set, which is specified with a list tag like those in - /// CellSetListTag.h. Since C++ does not allow you to actually change the + /// CellSetList.h. Since C++ does not allow you to actually change the /// template arguments, this method returns a new dynamic cell setobject. /// This method is particularly useful to narrow down (or expand) the types /// when using a cell set of particular constraints. @@ -143,7 +143,7 @@ public: /// Attempts to cast the held cell set to a specific concrete type, then call /// the given functor with the cast cell set. The cell sets tried in the cast /// are those in the \c CellSetList template argument of the \c - /// DynamicCellSetBase class (or \c VTKM_DEFAULT_CELL_SET_LIST_TAG for \c + /// DynamicCellSetBase class (or \c VTKM_DEFAULT_CELL_SET_LIST for \c /// DynamicCellSet). You can use \c ResetCellSetList to get different /// behavior from \c CastAndCall. /// diff --git a/vtkm/cont/RuntimeDeviceInformation.cxx b/vtkm/cont/RuntimeDeviceInformation.cxx index 183c590e9..888cad222 100644 --- a/vtkm/cont/RuntimeDeviceInformation.cxx +++ b/vtkm/cont/RuntimeDeviceInformation.cxx @@ -9,9 +9,9 @@ //============================================================================ #include -#include +#include #include -#include +#include #include //Bring in each device adapters runtime class diff --git a/vtkm/cont/Timer.h b/vtkm/cont/Timer.h index 566dc9819..071fc1d3d 100644 --- a/vtkm/cont/Timer.h +++ b/vtkm/cont/Timer.h @@ -10,9 +10,9 @@ #ifndef vtk_m_cont_Timer_h #define vtk_m_cont_Timer_h -#include +#include #include -#include +#include #include diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h index bf9142130..78942afa2 100644 --- a/vtkm/cont/TryExecute.h +++ b/vtkm/cont/TryExecute.h @@ -165,7 +165,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId, /// This function returns \c true if the functor succeeded on a device, /// \c false otherwise. /// -/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG +/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST /// is used. /// template @@ -231,7 +231,7 @@ VTKM_CONT bool TryExecuteOnDevice(vtkm::cont::DeviceAdapterId devId, /// This function returns \c true if the functor succeeded on a device, /// \c false otherwise. /// -/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG +/// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST /// is used. /// template diff --git a/vtkm/cont/VariantArrayHandle.h b/vtkm/cont/VariantArrayHandle.h index 2c1e048ac..9ab2a5ffe 100644 --- a/vtkm/cont/VariantArrayHandle.h +++ b/vtkm/cont/VariantArrayHandle.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include @@ -205,7 +205,7 @@ public: /// /// In addition to the value type, an \c ArrayHandle also requires a storage tag. /// By default, \c CastAndCall attempts to cast the array using the storage tags - /// listed in \c VTKM_DEFAULT_STORAGE_LIST_TAG. You can optionally give a custom + /// listed in \c VTKM_DEFAULT_STORAGE_LIST. You can optionally give a custom /// list of storage tags as the second argument. If the storage of the underlying /// array does not match any of the storage tags given, then the array will /// be cast to an \c ArrayHandleVirtual, which can hold any array given the diff --git a/vtkm/cont/VirtualObjectHandle.h b/vtkm/cont/VirtualObjectHandle.h index 766e71273..5147f1ef0 100644 --- a/vtkm/cont/VirtualObjectHandle.h +++ b/vtkm/cont/VirtualObjectHandle.h @@ -10,7 +10,7 @@ #ifndef vtk_m_cont_VirtualObjectHandle_h #define vtk_m_cont_VirtualObjectHandle_h -#include +#include #include #include #include diff --git a/vtkm/cont/VirtualObjectHandle.hxx b/vtkm/cont/VirtualObjectHandle.hxx index 0618eee7b..a51999872 100644 --- a/vtkm/cont/VirtualObjectHandle.hxx +++ b/vtkm/cont/VirtualObjectHandle.hxx @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/vtkm/cont/arg/TypeCheckTagArray.h b/vtkm/cont/arg/TypeCheckTagArray.h index 30bd44007..29705bab3 100644 --- a/vtkm/cont/arg/TypeCheckTagArray.h +++ b/vtkm/cont/arg/TypeCheckTagArray.h @@ -12,7 +12,7 @@ #include -#include +#include #include diff --git a/vtkm/cont/internal/DeviceAdapterListHelpers.h b/vtkm/cont/internal/DeviceAdapterListHelpers.h index a42991a50..08695cabc 100644 --- a/vtkm/cont/internal/DeviceAdapterListHelpers.h +++ b/vtkm/cont/internal/DeviceAdapterListHelpers.h @@ -10,7 +10,7 @@ #ifndef vtk_m_cont_internal_DeviceAdapterListHelpers_h #define vtk_m_cont_internal_DeviceAdapterListHelpers_h -#include +#include #include #include diff --git a/vtkm/cont/testing/TestingImplicitFunction.h b/vtkm/cont/testing/TestingImplicitFunction.h index 0f21dbac6..675606689 100644 --- a/vtkm/cont/testing/TestingImplicitFunction.h +++ b/vtkm/cont/testing/TestingImplicitFunction.h @@ -11,7 +11,7 @@ #define vtk_m_cont_testing_TestingImplicitFunction_h #include -#include +#include #include #include #include diff --git a/vtkm/cont/testing/UnitTestStorageList.cxx b/vtkm/cont/testing/UnitTestStorageList.cxx index 773007e9f..90fb37caa 100644 --- a/vtkm/cont/testing/UnitTestStorageList.cxx +++ b/vtkm/cont/testing/UnitTestStorageList.cxx @@ -50,11 +50,11 @@ void CheckSame(const vtkm::Vec& expected, const std::vector& } } -template -void TryList(const vtkm::Vec& expected, ListTag) +template +void TryList(const vtkm::Vec& expected, List) { TestFunctor functor; - vtkm::ListForEach(functor, ListTag()); + vtkm::ListForEach(functor, List()); CheckSame(expected, functor.FoundTypes); } diff --git a/vtkm/cont/testing/UnitTestStorageListTag.cxx b/vtkm/cont/testing/UnitTestStorageListTag.cxx index aba2c5d64..b7ca1383e 100644 --- a/vtkm/cont/testing/UnitTestStorageListTag.cxx +++ b/vtkm/cont/testing/UnitTestStorageListTag.cxx @@ -8,6 +8,8 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ +// This tests deprecated code until it is deleted. + #include #include diff --git a/vtkm/cont/testing/UnitTestTimer.cxx b/vtkm/cont/testing/UnitTestTimer.cxx index c4dd89868..901f4f6db 100644 --- a/vtkm/cont/testing/UnitTestTimer.cxx +++ b/vtkm/cont/testing/UnitTestTimer.cxx @@ -8,7 +8,7 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#include +#include #include #include diff --git a/vtkm/exec/AtomicArrayExecutionObject.h b/vtkm/exec/AtomicArrayExecutionObject.h index 7fdf8f8ea..a943602b3 100644 --- a/vtkm/exec/AtomicArrayExecutionObject.h +++ b/vtkm/exec/AtomicArrayExecutionObject.h @@ -10,7 +10,7 @@ #ifndef vtk_m_exec_AtomicArrayExecutionObject_h #define vtk_m_exec_AtomicArrayExecutionObject_h -#include +#include #include #include #include diff --git a/vtkm/filter/FilterTraits.h b/vtkm/filter/FilterTraits.h index 1b11e9810..68d6c4988 100644 --- a/vtkm/filter/FilterTraits.h +++ b/vtkm/filter/FilterTraits.h @@ -24,7 +24,7 @@ class Filter; //namespace detail //{ //// template vtkm::List as_list(T); -//vtkm::ListUniversal as_list(vtkm::ListTagUniversal); +//vtkm::ListUniversal as_list(vtkm::ListUniversal); //template //vtkm::List as_list(vtkm::List); //} diff --git a/vtkm/filter/PolicyBase.h b/vtkm/filter/PolicyBase.h index 52a79bd66..cac595077 100644 --- a/vtkm/filter/PolicyBase.h +++ b/vtkm/filter/PolicyBase.h @@ -13,13 +13,13 @@ #include -#include +#include #include #include -#include +#include #include #include -#include +#include #include diff --git a/vtkm/filter/PolicyExtrude.h b/vtkm/filter/PolicyExtrude.h index dce6fd23e..ea050b7a7 100644 --- a/vtkm/filter/PolicyExtrude.h +++ b/vtkm/filter/PolicyExtrude.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace vtkm diff --git a/vtkm/rendering/raytracing/MeshConnectivityBase.h b/vtkm/rendering/raytracing/MeshConnectivityBase.h index 2a63e9460..30850689f 100644 --- a/vtkm/rendering/raytracing/MeshConnectivityBase.h +++ b/vtkm/rendering/raytracing/MeshConnectivityBase.h @@ -308,8 +308,7 @@ private: public: MeshConnHandle() = default; - template + template explicit MeshConnHandle(MeshConnType* meshConn, bool aquireOwnership = true, DeviceAdapterList devices = DeviceAdapterList()) @@ -318,7 +317,7 @@ public: } }; -template +template VTKM_CONT MeshConnHandle make_MeshConnHandle(MeshConnType&& func, DeviceAdapterList devices = DeviceAdapterList()) { diff --git a/vtkm/rendering/raytracing/RayTracingTypeDefs.h b/vtkm/rendering/raytracing/RayTracingTypeDefs.h index f446bda15..883a0897c 100644 --- a/vtkm/rendering/raytracing/RayTracingTypeDefs.h +++ b/vtkm/rendering/raytracing/RayTracingTypeDefs.h @@ -11,13 +11,13 @@ #define vtk_m_rendering_raytracing_RayTracingTypeDefs_h #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/vtkm/testing/UnitTestList.cxx b/vtkm/testing/UnitTestList.cxx index 5561ac46d..e06189bc5 100644 --- a/vtkm/testing/UnitTestList.cxx +++ b/vtkm/testing/UnitTestList.cxx @@ -150,10 +150,10 @@ void TestLists() VTKM_TEST_ASSERT(vtkm::internal::IsList::value); VTKM_TEST_ASSERT(vtkm::internal::IsList::value); - std::cout << "ListTagEmpty" << std::endl; + std::cout << "ListEmpty" << std::endl; CheckList(vtkm::List<>{}, vtkm::ListEmpty{}); - std::cout << "ListTagAppend" << std::endl; + std::cout << "ListAppend" << std::endl; CheckList(vtkm::List, TestClass<32>, TestClass<33>, @@ -164,7 +164,7 @@ void TestLists() vtkm::List>, vtkm::List, TestClass<22>>>{}); - std::cout << "ListTagIntersect" << std::endl; + std::cout << "ListIntersect" << std::endl; CheckList(vtkm::List, TestClass<5>>{}, vtkm::ListIntersect< vtkm::List, TestClass<2>, TestClass<3>, TestClass<4>, TestClass<5>>, diff --git a/vtkm/testing/UnitTestTypeList.cxx b/vtkm/testing/UnitTestTypeList.cxx index d8b1e1924..dfa527231 100644 --- a/vtkm/testing/UnitTestTypeList.cxx +++ b/vtkm/testing/UnitTestTypeList.cxx @@ -76,11 +76,11 @@ struct TestFunctor } }; -template -void TryList(const TypeSet& expected, ListTag) +template +void TryList(const TypeSet& expected, List) { TestFunctor functor(expected); - vtkm::ListForEach(functor, ListTag()); + vtkm::ListForEach(functor, List()); functor.ExpectedTypes.CheckFound(); } diff --git a/vtkm/testing/UnitTestTypeListTag.cxx b/vtkm/testing/UnitTestTypeListTag.cxx index 62a05a250..6ae1614cc 100644 --- a/vtkm/testing/UnitTestTypeListTag.cxx +++ b/vtkm/testing/UnitTestTypeListTag.cxx @@ -8,6 +8,8 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ +// This tests deprecated code until it is deleted. + #include #include diff --git a/vtkm/worklet/ExtractStructured.h b/vtkm/worklet/ExtractStructured.h index b8a94c0cc..b16ae7e28 100644 --- a/vtkm/worklet/ExtractStructured.h +++ b/vtkm/worklet/ExtractStructured.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vtkm/worklet/moments/ComputeMoments.h b/vtkm/worklet/moments/ComputeMoments.h index 4d818fafd..28ed4c20a 100644 --- a/vtkm/worklet/moments/ComputeMoments.h +++ b/vtkm/worklet/moments/ComputeMoments.h @@ -269,7 +269,7 @@ public: int maxOrder, vtkm::cont::DataSet& output) const { - input.ResetCellSetList(vtkm::cont::CellSetListTagStructured()) + input.ResetCellSetList(vtkm::cont::CellSetListStructured()) .CastAndCall(ResolveDynamicCellSet(), pixels, this->Spacing, this->Radius, maxOrder, output); }