Commit 53964157 authored by Dave Pugmire's avatar Dave Pugmire

Rollback the cast warning changes.

parent efbc8d68
...@@ -65,10 +65,10 @@ private: ...@@ -65,10 +65,10 @@ private:
OutType sum = OutType(pointValues[0]); OutType sum = OutType(pointValues[0]);
for (vtkm::IdComponent pointIndex = 1; pointIndex < numPoints; ++pointIndex) for (vtkm::IdComponent pointIndex = 1; pointIndex < numPoints; ++pointIndex)
{ {
sum = static_cast<OutType>(sum + OutType(pointValues[pointIndex])); sum = sum + OutType(pointValues[pointIndex]);
} }
average = static_cast<OutType>(sum / OutType(static_cast<OutComponentType>(numPoints))); average = sum / OutType(static_cast<OutComponentType>(numPoints));
} }
template <typename PointValueVecType, typename OutType> template <typename PointValueVecType, typename OutType>
......
...@@ -827,7 +827,7 @@ public: ...@@ -827,7 +827,7 @@ public:
for (vtkm::IdComponent i = 1; i < numValues; i++) for (vtkm::IdComponent i = 1; i < numValues; i++)
{ {
MappedValueType value = toReduce[i]; MappedValueType value = toReduce[i];
sum = static_cast<MappedValueType>(sum + value); sum = sum + value;
} }
centroid = internal::Scale(sum, 1. / static_cast<vtkm::Float64>(numValues)); centroid = internal::Scale(sum, 1. / static_cast<vtkm::Float64>(numValues));
} }
......
...@@ -72,10 +72,10 @@ private: ...@@ -72,10 +72,10 @@ private:
OutType sum = OutType(cellValues[0]); OutType sum = OutType(cellValues[0]);
for (vtkm::IdComponent cellIndex = 1; cellIndex < numCells; ++cellIndex) for (vtkm::IdComponent cellIndex = 1; cellIndex < numCells; ++cellIndex)
{ {
sum = static_cast<OutType>(sum + OutType(cellValues[cellIndex])); sum = sum + OutType(cellValues[cellIndex]);
} }
average = static_cast<OutType>(sum / OutType(static_cast<OutComponentType>(numCells))); average = sum / OutType(static_cast<OutComponentType>(numCells));
} }
template <typename CellValueVecType, typename OutType> template <typename CellValueVecType, typename OutType>
......
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