mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Fix type conversion warning when size_t
differs from vtkm::Id
.
This commit is contained in:
parent
1d9f6b37cf
commit
7148ab3425
@ -654,7 +654,7 @@ void ContourTreeMesh<FieldType>::mergeWith(ContourTreeMesh<FieldType>& other)
|
|||||||
std::inplace_merge(
|
std::inplace_merge(
|
||||||
neighboursBegin, neighboursBegin + combinedOtherStartIndexPortal.Get(vtx), neighboursEnd);
|
neighboursBegin, neighboursBegin + combinedOtherStartIndexPortal.Get(vtx), neighboursEnd);
|
||||||
auto it = std::unique(neighboursBegin, neighboursEnd);
|
auto it = std::unique(neighboursBegin, neighboursEnd);
|
||||||
combinedOtherStartIndexPortal.Set(vtx, neighboursEnd - it);
|
combinedOtherStartIndexPortal.Set(vtx, static_cast<vtkm::Id>(neighboursEnd - it));
|
||||||
while (it != neighboursEnd)
|
while (it != neighboursEnd)
|
||||||
*(it++) = NO_SUCH_ELEMENT;
|
*(it++) = NO_SUCH_ELEMENT;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user