Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

more warning fixes

Browse Source
This commit is contained in:
Jeremy Meredith 2015-09-01 14:11:47 -04:00
parent 52458e853f
commit 94b8b9f5b0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/cont/CellSetExplicit.h
View File

@ -255,7 +255,7 @@ public:
void CreateCellToPointConnectivity()
{
std::multimap<int,int> cells_of_nodes;
std::multimap<vtkm::Id,vtkm::Id> cells_of_nodes;
vtkm::Id maxNodeID = 0;
vtkm::Id numCells = GetNumberOfCells();
@ -268,7 +268,7 @@ public:
vtkm::Id index = this->PointToCell.Connectivity.GetPortalControl().Get(cindex++);
if (index > maxNodeID)
maxNodeID = index;
cells_of_nodes.insert(std::pair<int,int>(index,cell));
cells_of_nodes.insert(std::pair<vtkm::Id,vtkm::Id>(index,cell));
}
}
@ -277,10 +277,10 @@ public:
std::vector<vtkm::Id> conn;
vtkm::Id filled_array_to_node = 0;
for (std::multimap<int,int>::iterator iter = cells_of_nodes.begin();
for (std::multimap<vtkm::Id,vtkm::Id>::iterator iter = cells_of_nodes.begin();
iter != cells_of_nodes.end(); iter++)
{
int node = iter->first;
vtkm::Id node = iter->first;
while (filled_array_to_node <= node)
{
// add empty spots to skip nodes not referenced by our cells