Commit 55a2dcc8 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'bump_vtkm_for_intel_compiler_fixes'

95b41e2b Bump the VTK-m submodule so that we compile on Intel.
1d3f440c VTK-m: Consistently use the free standing CastAndCall function
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3686
parents 9a0449cc 95b41e2b
......@@ -376,7 +376,8 @@ vtkDataArray* Convert(const vtkm::cont::Field& input)
try
{
vtkm::filter::ApplyPolicy(input, policy).CastAndCall(aConverter);
vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicy(input, policy),
aConverter);
data = aConverter.Data;
if (data)
{
......@@ -399,7 +400,8 @@ vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input)
vtkPoints* points = nullptr;
try
{
vtkm::filter::ApplyPolicy(input, policy).CastAndCall(aConverter);
vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicy(input, policy),
aConverter);
vtkDataArray* pdata = aConverter.Data;
points = vtkPoints::New();
points->SetData(pdata);
......
......@@ -371,7 +371,8 @@ bool Convert(const vtkm::cont::DynamicCellSet& toConvert, vtkCellArray* cells,
vtkmOutputFilterPolicy policy;
bool didConversion = false;
CellSetConverter cConverter(&didConversion, cells, types, locations);
vtkm::filter::ApplyPolicy(toConvert, policy).CastAndCall(cConverter);
vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicy(toConvert, policy),
cConverter);
return didConversion;
}
}
Subproject commit 5ca31f70728731a81ec46b331b36a8a91a03c665
Subproject commit 0de08aae0692375e2a3510a59af352f8dfe8f02d
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