From d468784f00c1b510b3dce75686e7b7b7e21e3e4e Mon Sep 17 00:00:00 2001
From: Robert Maynard <robert.maynard@kitware.com>
Date: Mon, 29 Apr 2019 13:15:42 -0400
Subject: [PATCH] Correct more host/device warnings from methods that should be
 host only

---
 vtkm/cont/ArrayHandleCompositeVector.h     | 6 +++---
 vtkm/worklet/particleadvection/Particles.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h
index ae91d8c1c..9cde411d6 100644
--- a/vtkm/cont/ArrayHandleCompositeVector.h
+++ b/vtkm/cont/ArrayHandleCompositeVector.h
@@ -348,7 +348,7 @@ struct ArraySizeValidatorImpl
 {
   using Next = ArraySizeValidatorImpl<Index + 1, Count, TupleType>;
 
-  VTKM_EXEC_CONT
+  VTKM_CONT
   static bool Exec(const TupleType& tuple, vtkm::Id numVals)
   {
     return vtkmstd::get<Index>(tuple).GetNumberOfValues() == numVals && Next::Exec(tuple, numVals);
@@ -358,14 +358,14 @@ struct ArraySizeValidatorImpl
 template <std::size_t Index, typename TupleType>
 struct ArraySizeValidatorImpl<Index, Index, TupleType>
 {
-  VTKM_EXEC_CONT
+  VTKM_CONT
   static bool Exec(const TupleType&, vtkm::Id) { return true; }
 };
 
 template <typename TupleType>
 struct ArraySizeValidator
 {
-  VTKM_EXEC_CONT
+  VTKM_CONT
   static bool Exec(const TupleType& tuple, vtkm::Id numVals)
   {
     return ArraySizeValidatorImpl<0, vtkmstd::tuple_size<TupleType>::value, TupleType>::Exec(
diff --git a/vtkm/worklet/particleadvection/Particles.h b/vtkm/worklet/particleadvection/Particles.h
index 4c62fbb2d..90d5594ed 100644
--- a/vtkm/worklet/particleadvection/Particles.h
+++ b/vtkm/worklet/particleadvection/Particles.h
@@ -201,7 +201,7 @@ public:
       this->PosArray, this->StepsArray, this->StatusArray, this->TimeArray, this->MaxSteps);
   }
 
-  VTKM_EXEC_CONT
+  VTKM_CONT
   Particles(vtkm::cont::ArrayHandle<VectorType>& posArray,
             vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
             vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,