Skip to content
Snippets Groups Projects
Commit f07cd4ec authored by Robert Maynard's avatar Robert Maynard Committed by T.J. Corona
Browse files

Update VTK-m for GCC 4.8.5 fixes and osx-clang warning fixes

(cherry picked from commit 6b71feb3)
parent faa45a79
No related branches found
No related tags found
No related merge requests found
......@@ -46,7 +46,8 @@ vtkm::cont::VariantArrayHandle vtkDataArrayToVariantArrayHandle(DataArrayType* i
{
vtkm::Id numTuples = input->GetNumberOfTuples();
auto subHandle = DataArrayToArrayHandle<DataArrayType, 1>::Wrap(input);
auto offsets = vtkm::cont::ArrayHandleCounting<vtkm::IdComponent>(0, numComps, numTuples);
auto offsets =
vtkm::cont::ArrayHandleCounting<vtkm::Id>(vtkm::Id(0), vtkm::Id(numComps), numTuples);
auto handle = vtkm::cont::make_ArrayHandleGroupVecVariable(subHandle, offsets);
return vtkm::cont::VariantArrayHandle(handle);
}
......
Subproject commit b30827215cfbfaae05943699d176ff1ca0e10471
Subproject commit f395e084d821265d4ddc782f22c8d9edf8f1f411
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment