diff --git a/vtkm/filter/multi_block/testing/UnitTestMergeDataSetsFilter.cxx b/vtkm/filter/multi_block/testing/UnitTestMergeDataSetsFilter.cxx index 0c158d01f..581ca2639 100644 --- a/vtkm/filter/multi_block/testing/UnitTestMergeDataSetsFilter.cxx +++ b/vtkm/filter/multi_block/testing/UnitTestMergeDataSetsFilter.cxx @@ -356,7 +356,7 @@ void TestDifferentCoords() vtkm::filter::multi_block::MergeDataSets mergeDataSets; try { - auto result = mergeDataSets.Execute(inputDataSets); + mergeDataSets.Execute(inputDataSets); } catch (vtkm::cont::ErrorExecution& e) { @@ -375,7 +375,7 @@ void TestDifferentCoords() inputDataSets2.AppendPartition(dataSet2); try { - auto result = mergeDataSets.Execute(inputDataSets2); + mergeDataSets.Execute(inputDataSets2); } catch (vtkm::cont::ErrorExecution& e) { @@ -446,9 +446,6 @@ void TestMissingFieldsAndSameFieldName() vtkm::cont::make_ArrayHandle( { 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }); vtkm::cont::ArrayHandle validatePointVar2 = - vtkm::cont::make_ArrayHandle( - { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f }); - vtkm::cont::ArrayHandle validatePointVar3 = vtkm::cont::make_ArrayHandle( { 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f, 10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f }); vtkm::cont::ArrayHandle validateCellVar = @@ -479,7 +476,7 @@ void TestMissingFieldsAndSameFieldName() test_equal_ArrayHandles(result.GetPartition(0) .GetField("fieldSameName2", vtkm::cont::Field::Association::Points) .GetData(), - validatePointVar3), + validatePointVar2), "wrong fieldSameName2 values"); VTKM_TEST_ASSERT( test_equal_ArrayHandles(result.GetPartition(0)