GetNumberOfPointsInCell consistently returns a vtkm::IdComponent

This commit is contained in:
Robert Maynard 2015-09-23 14:36:56 -04:00
parent 25ff1e9403
commit c6dbc0f20e
2 changed files with 3 additions and 3 deletions

@ -199,7 +199,7 @@ void WriteVtkLegacyUnstructuredGrid(const char *fname, const vtkm::cont::DataSet
vtkm::Vec<vtkm::Id, 8> pointIndices;
for (vtkm::Id i = 0; i < numCells; ++i)
{
vtkm::Id numCellPoints = cse.GetNumberOfPointsInCell(i);
vtkm::IdComponent numCellPoints = cse.GetNumberOfPointsInCell(i);
idxBuffer.push_back(static_cast<int>(numCellPoints));
cse.GetIndices(i, pointIndices);
for (vtkm::IdComponent j = 0; j < numCellPoints; ++j)

@ -117,7 +117,7 @@ public:
}
VTKM_CONT_EXPORT
vtkm::Id GetNumberOfPointsInCell(vtkm::Id cellIndex) const
vtkm::IdComponent GetNumberOfPointsInCell(vtkm::Id cellIndex) const
{
return this->PointToCell.NumIndices.GetPortalConstControl().Get(cellIndex);
}
@ -134,7 +134,7 @@ public:
vtkm::Vec<vtkm::Id,ItemTupleLength> &ids) const
{
this->PointToCell.BuildIndexOffsets(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
vtkm::Id numIndices = this->GetNumberOfPointsInCell(index);
vtkm::IdComponent numIndices = this->GetNumberOfPointsInCell(index);
vtkm::Id start =
this->PointToCell.IndexOffsets.GetPortalConstControl().Get(index);
for (vtkm::IdComponent i=0; i<numIndices && i<ItemTupleLength; i++)