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 <kwrobot@kitware.com>
Merge-request: !3686

Accelerators/Vtkm/vtkmlib/ArrayConverters.cxx

@@ -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);

Accelerators/Vtkm/vtkmlib/CellSetConverters.cxx

@@ -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;
 }
 }

vtk-m @ 0de08aae

-Subproject commit 5ca31f70728731a81ec46b331b36a8a91a03c665
+Subproject commit 0de08aae0692375e2a3510a59af352f8dfe8f02d