fix warnings

This commit is contained in:
Mark Kim 2019-06-21 14:39:23 -04:00
parent 876727d81f
commit fc479aa02c
2 changed files with 7 additions and 3 deletions

@ -38,7 +38,7 @@ VTKM_CONT CellSetExtrude::CellSetExtrude(const vtkm::cont::ArrayHandle<vtkm::Int
: vtkm::cont::CellSet(name)
, IsPeriodic(periodic)
, NumberOfPointsPerPlane(numberOfPointsPerPlane)
, NumberOfCellsPerPlane(conn.GetNumberOfValues() / 3)
, NumberOfCellsPerPlane(conn.GetNumberOfValues() / static_cast<vtkm::Id>(3))
, NumberOfPlanes(numberOfPlanes)
, Connectivity(conn)
, NextNode(nextNode)

@ -147,7 +147,7 @@ public:
IndicesType GetIndices(const vtkm::Id2& index) const;
template <typename IndexType>
VTKM_EXEC vtkm::IdComponent GetNumberOfIndices(const IndexType& index) const
VTKM_EXEC vtkm::IdComponent GetNumberOfIndices(const IndexType& vtkmNotUsed(index)) const
{
return 1;
}
@ -208,7 +208,11 @@ typename ConnectivityExtrude<Device>::IndicesType ConnectivityExtrude<Device>::G
pointIds2[i] = this->NextNode.Get(pointIds1[i]);
}
return IndicesType(pointIds1, p0, pointIds2, p1, this->NumberOfPointsPerPlane);
return IndicesType(pointIds1,
static_cast<vtkm::Int32>(p0),
pointIds2,
static_cast<vtkm::Int32>(p1),
this->NumberOfPointsPerPlane);
}