Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'mark_more_methods_as_control_side_only'

Browse Source 
d468784f0 Correct more host/device warnings from methods that should be host only

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1660
This commit is contained in:
Robert Maynard 2019-04-29 21:12:00 +00:00 committed by Kitware Robot
commit f3c038f6e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/cont/ArrayHandleCompositeVector.h
View File

@ -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(

2
vtkm/worklet/particleadvection/Particles.h
View File

@ -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,