Commit f3c038f6 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'mark_more_methods_as_control_side_only'

d468784f Correct more host/device warnings from methods that should be host only
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1660
parents 33a30299 d468784f
...@@ -348,7 +348,7 @@ struct ArraySizeValidatorImpl ...@@ -348,7 +348,7 @@ struct ArraySizeValidatorImpl
{ {
using Next = ArraySizeValidatorImpl<Index + 1, Count, TupleType>; using Next = ArraySizeValidatorImpl<Index + 1, Count, TupleType>;
VTKM_EXEC_CONT VTKM_CONT
static bool Exec(const TupleType& tuple, vtkm::Id numVals) static bool Exec(const TupleType& tuple, vtkm::Id numVals)
{ {
return vtkmstd::get<Index>(tuple).GetNumberOfValues() == numVals && Next::Exec(tuple, numVals); return vtkmstd::get<Index>(tuple).GetNumberOfValues() == numVals && Next::Exec(tuple, numVals);
...@@ -358,14 +358,14 @@ struct ArraySizeValidatorImpl ...@@ -358,14 +358,14 @@ struct ArraySizeValidatorImpl
template <std::size_t Index, typename TupleType> template <std::size_t Index, typename TupleType>
struct ArraySizeValidatorImpl<Index, Index, TupleType> struct ArraySizeValidatorImpl<Index, Index, TupleType>
{ {
VTKM_EXEC_CONT VTKM_CONT
static bool Exec(const TupleType&, vtkm::Id) { return true; } static bool Exec(const TupleType&, vtkm::Id) { return true; }
}; };
template <typename TupleType> template <typename TupleType>
struct ArraySizeValidator struct ArraySizeValidator
{ {
VTKM_EXEC_CONT VTKM_CONT
static bool Exec(const TupleType& tuple, vtkm::Id numVals) static bool Exec(const TupleType& tuple, vtkm::Id numVals)
{ {
return ArraySizeValidatorImpl<0, vtkmstd::tuple_size<TupleType>::value, TupleType>::Exec( return ArraySizeValidatorImpl<0, vtkmstd::tuple_size<TupleType>::value, TupleType>::Exec(
......
...@@ -201,7 +201,7 @@ public: ...@@ -201,7 +201,7 @@ public:
this->PosArray, this->StepsArray, this->StatusArray, this->TimeArray, this->MaxSteps); this->PosArray, this->StepsArray, this->StatusArray, this->TimeArray, this->MaxSteps);
} }
VTKM_EXEC_CONT VTKM_CONT
Particles(vtkm::cont::ArrayHandle<VectorType>& posArray, Particles(vtkm::cont::ArrayHandle<VectorType>& posArray,
vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray, vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
vtkm::cont::ArrayHandle<vtkm::Id>& statusArray, vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,
......
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