Merge topic 'triangluate_table_conversion_warning'

81147365 fix a long long to int warning.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !361
This commit is contained in:
Robert Maynard 2016-03-16 15:26:36 -04:00 committed by Kitware Robot
commit 28c0118d83

@ -288,7 +288,7 @@ public:
vtkm::NUMBER_OF_CELL_SHAPES)),
Indices(vtkm::cont::make_ArrayHandle(
vtkm::worklet::internal::TetrahedronIndexData,
sizeof(vtkm::worklet::internal::TetrahedronIndexData)/sizeof(vtkm::IdComponent)))
vtkm::Id(44) ))
{ }
template<typename Device>