From 00b73b63b25e50066ee85e172f727ad3f3e33b67 Mon Sep 17 00:00:00 2001 From: James Kress Date: Tue, 7 Feb 2017 11:52:53 -0500 Subject: [PATCH] Updating formatting and fixing compiler warnings --- .../testing/UnitTestDataSetBuilderRectilinear.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx b/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx index 322068e6b..bfa014a94 100644 --- a/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx +++ b/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx @@ -163,12 +163,12 @@ RectilinearTests() numPoints = dimensions[0]; numCells = dimensions[0]-1; std::vector varP1D(static_cast(numPoints)); - for (vtkm::Id i = 0; i < numPoints; i++) + for (unsigned long i = 0; i < static_cast(numPoints); i++) { varP1D[i] = static_cast(i*1.1f); } std::vector varC1D(static_cast(numCells)); - for (vtkm::Id i = 0; i < numCells; i++) + for (unsigned long i = 0; i < static_cast(numCells); i++) { varC1D[i] = static_cast(i*1.1f); } @@ -183,12 +183,12 @@ RectilinearTests() numPoints = dimensions[0]*dimensions[1]; numCells = (dimensions[0]-1)*(dimensions[1]-1); std::vector varP2D(static_cast(numPoints)); - for (vtkm::Id i = 0; i < numPoints; i++) + for (unsigned long i = 0; i < static_cast(numPoints); i++) { varP2D[i] = static_cast(i*1.1f); } std::vector varC2D(static_cast(numCells)); - for (vtkm::Id i = 0; i < numCells; i++) + for (unsigned long i = 0; i < static_cast(numCells); i++) { varC2D[i] = static_cast(i*1.1f); } @@ -219,12 +219,12 @@ RectilinearTests() numPoints *= dimensions[2]; numCells *= dimensions[2]-1; std::vector varP3D(static_cast(numPoints)); - for (vtkm::Id i = 0; i < numPoints; i++) + for (unsigned long i = 0; i < static_cast(numPoints); i++) { varP3D[i] = static_cast(i*1.1f);; } std::vector varC3D(static_cast(numCells)); - for (vtkm::Id i = 0; i < numCells; i++) + for (unsigned long i = 0; i < static_cast(numCells); i++) { varC3D[i] = static_cast(i*1.1f); }