Commit 0e824173 authored by Andrew Maclean's avatar Andrew Maclean

Favouring preincrement according to cppcheck recommendations.

parent 7b665acc
......@@ -120,7 +120,7 @@ namespace
const std::vector<unsigned int>& bin =
this->GetBin(idx);
std::vector<unsigned int>::const_iterator iter;
for(iter=bin.begin(); iter!=bin.end(); iter++)
for(iter=bin.begin(); iter!=bin.end(); ++iter)
{
boxes.insert(*iter);
}
......@@ -756,7 +756,7 @@ void vtkAMRInformation::CalculateParentChildRelationShip(
std::set<unsigned int> boxes;
binner.GetBoxesInIntersectingBins(box, boxes);
std::set<unsigned int>::iterator iter;
for (iter=boxes.begin(); iter!=boxes.end(); iter++)
for (iter=boxes.begin(); iter!=boxes.end(); ++iter)
{
vtkAMRBox potentialParent = this->GetAMRBox(level - 1, *iter);
if (!potentialParent.IsInvalid())
......
......@@ -420,7 +420,7 @@ void vtkAMRUtilities::BlankGridsAtLevel(vtkOverlappingAMR* amr, int levelIdx,
// For each higher res box fill in the cells that
// it covers
for (iter=dsChildren.begin(); iter!=dsChildren.end(); iter++)
for (iter=dsChildren.begin(); iter!=dsChildren.end(); ++iter)
{
vtkAMRBox ibox;;
int childGridIndex = amr->GetCompositeIndex(levelIdx+1, *iter);
......
......@@ -195,7 +195,7 @@ void vtkDataObjectTree::CopyStructure(vtkCompositeDataSet* compositeSource)
source->Internals->Children.begin();
vtkDataObjectTreeInternals::Iterator myIter =
this->Internals->Children.begin();
for (; srcIter != source->Internals->Children.end(); ++srcIter, myIter++)
for (; srcIter != source->Internals->Children.end(); ++srcIter, ++myIter)
{
vtkDataObjectTree* compositeSrc =
vtkDataObjectTree::SafeDownCast(srcIter->DataObject);
......
......@@ -223,11 +223,11 @@ public:
this->ChildIndex++;
if (this->Reverse)
{
this->ReverseIter++;
++this->ReverseIter;
}
else
{
this->Iter++;
++this->Iter;
}
this->InitChildIterator();
}
......
......@@ -82,7 +82,7 @@ namespace
{
// we need to go to the very last entry
it = this->dist2ToIds.end();
it --;
--it;
// Even if we remove the very last entry, the number of points
// will still be greater than that of requested points. This
......@@ -96,7 +96,7 @@ namespace
this->NumberPoints -= it->second.size();
std::map< double, std::list< vtkIdType > >::iterator
it2 = it;
it2 --;
--it2;
this->LargestDist2 = it2->first;
this->dist2ToIds.erase( it );
}
......@@ -128,10 +128,10 @@ namespace
{
idList->InsertId( counter, *lit );
counter ++;
lit ++;
++lit;
}
it ++;
++it;
}
}
......@@ -342,7 +342,7 @@ void vtkIncrementalOctreePointLocator::GenerateRepresentation
nodeQuads = vtkCellArray::New();
nodeQuads->Allocate( 6 * static_cast < int > ( nodesList.size() ) );
for ( std::list< vtkIncrementalOctreeNode * >::iterator
lit = nodesList.begin(); lit != nodesList.end(); lit ++ )
lit = nodesList.begin(); lit != nodesList.end(); ++lit )
{
vtkIncrementalOctreePointLocator::AddPolys( *lit, thePoints, nodeQuads );
}
......
......@@ -129,12 +129,12 @@ namespace
if(this->NumPoints > this->NumDesiredPoints)
{
it=this->dist2ToIds.end();
it--;
--it;
if((this->NumPoints-it->second.size()) > this->NumDesiredPoints)
{
this->NumPoints -= it->second.size();
std::map<float, std::list<vtkIdType> >::iterator it2 = it;
it2--;
--it2;
this->LargestDist2 = it2->first;
this->dist2ToIds.erase(it);
}
......@@ -157,9 +157,9 @@ namespace
{
ids->InsertId(counter, *lit);
counter++;
lit++;
++lit;
}
it++;
++it;
}
}
......
......@@ -76,12 +76,12 @@ namespace
if(this->NumPoints > this->NumDesiredPoints)
{
it=this->dist2ToIds.end();
it--;
--it;
if((this->NumPoints-it->second.size()) > this->NumDesiredPoints)
{
this->NumPoints -= it->second.size();
std::map<float, std::list<vtkIdType> >::iterator it2 = it;
it2--;
--it2;
this->LargestDist2 = it2->first;
this->dist2ToIds.erase(it);
}
......@@ -105,9 +105,9 @@ namespace
{
ids->InsertId(counter, *lit);
counter++;
lit++;
++lit;
}
it++;
++it;
}
}
......@@ -1078,7 +1078,7 @@ void vtkOctreePointLocator::GenerateRepresentation(int level,
polys->Allocate(npolys);
for(std::list<vtkOctreePointLocatorNode*>::iterator it=nodesAtLevel.begin();
it!=nodesAtLevel.end();it++)
it!=nodesAtLevel.end();++it)
{
vtkOctreePointLocator::AddPolys(*it, pts, polys);
}
......
......@@ -1978,7 +1978,7 @@ void vtkReebGraph::CloseStream()
}
}
}
aIt++;
++aIt;
}
while(aIt != localAdjacency.end());
......
......@@ -109,7 +109,7 @@ int vtkEnsembleSource::ProcessRequest(vtkInformation *request,
this->Internal->Algorithms.begin();
std::vector<vtkSmartPointer<vtkAlgorithm> >::iterator end =
this->Internal->Algorithms.end();
for(; iter != end; iter++)
for(; iter != end; ++iter)
{
int retVal = (*iter)->ProcessRequest(request, inputVector, outputVector);
if (!retVal)
......
......@@ -44,7 +44,7 @@ vtkMultiTimeStepAlgorithm::vtkMultiTimeStepAlgorithm()
bool vtkMultiTimeStepAlgorithm::IsInCache(double time, size_t& idx)
{
std::vector<TimeCache>::iterator it = this->Cache.begin();
for(idx = 0; it != this->Cache.end(); it++, idx++)
for(idx = 0; it != this->Cache.end(); ++it, ++idx)
{
if (time == it->TimeValue)
{
......
......@@ -32,7 +32,7 @@ Cell::Cell (int id, vector<Node*> nodes)
_nodeIds = 0;
_count++;
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
(*it)->registerCell (this);
}
......@@ -43,7 +43,7 @@ Cell::Cell (int id, vector<Node*> nodes)
-----------------------------------------------------------------------*/
Cell::~Cell()
{
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
(*it)->unregisterCell (this);
}
......@@ -79,7 +79,7 @@ void Cell::refine ()
_nodes[4], _nodes[7], _nodes[6], _nodes[5]);
// desenregistrement de la maille aupres des noeuds
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
(*it)->unregisterCell (this);
}
......@@ -109,7 +109,7 @@ vtkIdType * Cell::getNodeIds()
delete [] _nodeIds;
_nodeIds = new vtkIdType[_nodes.size()+1];
int index = 0;
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
_nodeIds[index++] = (*it)->getId();
}
......
......@@ -76,7 +76,7 @@ vtkDataSet * Mesh::getDataSet()
// creation des points
vtkPoints * points = vtkPoints::New();
points->SetNumberOfPoints (_nodes.size());
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
int id = (*it)->getId();
if (id != -1) points->SetPoint (id, (*it)->getX(),(*it)->getY(),(*it)->getZ());
......@@ -88,7 +88,7 @@ vtkDataSet * Mesh::getDataSet()
int count = 0;
// ajout des mailles
for (vector<Cell*>::iterator it = _cells.begin(); it != _cells.end(); it++)
for (vector<Cell*>::iterator it = _cells.begin(); it != _cells.end(); ++it)
{
if (!(*it)->isRefined())
{
......@@ -223,7 +223,7 @@ void Mesh::refine()
vector<Cell*> tempCells = _cells;
// on itere sur toutes les mailles
for (vector<Cell*>::iterator it = tempCells.begin(); it != tempCells.end(); it++)
for (vector<Cell*>::iterator it = tempCells.begin(); it != tempCells.end(); ++it)
{
(*it)->refineIfNeeded();
}
......@@ -237,7 +237,7 @@ void Mesh::mergePoints ()
map<double, map<double , map<double, Node * > > > nodesMap;
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); it++)
for (vector<Node*>::iterator it = _nodes.begin(); it != _nodes.end(); ++it)
{
Node * n = (*it);
double x = n->getX();
......
......@@ -61,7 +61,7 @@ void Node::unregisterCell (Cell * c)
void Node::replaceBy (Node * n)
{
vector<Cell*> tmpCells = _cells;
for (vector<Cell*>::iterator it = tmpCells.begin(); it != tmpCells.end(); it++)
for (vector<Cell*>::iterator it = tmpCells.begin(); it != tmpCells.end(); ++it)
{
(*it)->replaceNode (this, n);
}
......
......@@ -107,7 +107,7 @@ int TestImageToAMR(int, char *[])
vtkIdTypeArray* cd = vtkArrayDownCast<vtkIdTypeArray>(image->GetCellData()->GetArray("vtkIdFilter_Ids"));
assert(cd);
for(std::vector<vtkVector3d>::iterator itr=samples.begin(); itr!=samples.end();itr++)
for(std::vector<vtkVector3d>::iterator itr=samples.begin(); itr!=samples.end();++itr)
{
double* x =(*itr).GetData();
vtkIdType cellId = FindCell(image,x);
......
......@@ -113,7 +113,7 @@ public:
std::vector<vtkInternalStructureCache *>::iterator it;
for (it = this->children.begin();
it != this->children.end();
it++)
++it)
{
delete *it;
}
......@@ -143,7 +143,7 @@ public:
std::vector<vtkInternalStructureCache *>::iterator it;
for (it = this->children.begin();
it != this->children.end();
it++)
++it)
{
(*it)->print(level+1);
}
......@@ -687,7 +687,7 @@ vtkDataObject * vtkDataObjectGenerator::FillOutputDataObjects(
std::vector<vtkInternalStructureCache *>::iterator git;
for (git = structure->children.begin();
git != structure->children.end();
git++)
++git)
{
vtkInternalStructureCache *gptr = *git;
vtkIdType nds = static_cast<vtkIdType>(gptr->children.size());
......@@ -701,7 +701,7 @@ vtkDataObject * vtkDataObjectGenerator::FillOutputDataObjects(
vtkIdType gcnt = 0;
for (git = structure->children.begin();
git != structure->children.end();
git++)
++git)
{
//cerr << "LVL=" << gcnt << endl;
......@@ -728,7 +728,7 @@ vtkDataObject * vtkDataObjectGenerator::FillOutputDataObjects(
dit != gptr->children.end()
&& dcnt<maxchildren //ignore extra children
;
dit++)
++dit)
{
//cerr << "DS=" << dcnt << endl;
vtkInternalStructureCache *dptr = *dit;
......@@ -811,7 +811,7 @@ vtkDataObject * vtkDataObjectGenerator::FillOutputDataObjects(
for (git = structure->children.begin();
git != structure->children.end();
git++)
++git)
{
this->ZOffset += 1.0;
vtkInternalStructureCache *gptr = *git;
......
......@@ -815,7 +815,7 @@ void vtkUnstructuredGridQuadricDecimationFaceMap::clear()
while (i!=faces.end())
{
delete (*i).second;
i++;
++i;
}
// clear the hash table
faces.clear();
......@@ -1246,7 +1246,7 @@ void vtkUnstructuredGridQuadricDecimationTetMesh::BuildFullMesh()
{
vtkUnstructuredGridQuadricDecimationFace *f = (*fi).second;
f->UpdateQuadric(boundaryWeight);
fi++;
++fi;
}
}
......
......@@ -1444,7 +1444,7 @@ vtkStringArray* vtkLagrangianBasicIntegrationModel::GetSurfaceArrayNames()
this->SurfaceArrayNames->SetNumberOfValues(0);
std::map<std::string, SurfaceArrayDescription>::const_iterator it;
for (it = this->SurfaceArrayDescriptions.begin(); it !=
this->SurfaceArrayDescriptions.end(); it++)
this->SurfaceArrayDescriptions.end(); ++it)
{
this->SurfaceArrayNames->InsertNextValue(it->first.c_str());
}
......@@ -1457,7 +1457,7 @@ vtkIntArray* vtkLagrangianBasicIntegrationModel::GetSurfaceArrayComps()
this->SurfaceArrayComps->SetNumberOfValues(0);
std::map<std::string, SurfaceArrayDescription>::const_iterator it;
for (it = this->SurfaceArrayDescriptions.begin(); it !=
this->SurfaceArrayDescriptions.end(); it++)
this->SurfaceArrayDescriptions.end(); ++it)
{
this->SurfaceArrayComps->InsertNextValue(it->second.nComp);
}
......@@ -1469,7 +1469,7 @@ vtkStringArray* vtkLagrangianBasicIntegrationModel::GetSurfaceArrayEnumValues()
this->SurfaceArrayEnumValues->SetNumberOfValues(0);
std::map<std::string, SurfaceArrayDescription>::const_iterator it;
for (it = this->SurfaceArrayDescriptions.begin(); it !=
this->SurfaceArrayDescriptions.end(); it++)
this->SurfaceArrayDescriptions.end(); ++it)
{
this->SurfaceArrayEnumValues->InsertVariantValue(
this->SurfaceArrayEnumValues->GetNumberOfValues(), it->second.enumValues.size());
......@@ -1488,7 +1488,7 @@ vtkDoubleArray* vtkLagrangianBasicIntegrationModel::GetSurfaceArrayDefaultValues
this->SurfaceArrayDefaultValues->SetNumberOfValues(0);
std::map<std::string, SurfaceArrayDescription>::const_iterator it;
for (it = this->SurfaceArrayDescriptions.begin(); it !=
this->SurfaceArrayDescriptions.end(); it++)
this->SurfaceArrayDescriptions.end(); ++it)
{
double* defaultValues = new double [it->second.nComp];
for (size_t iDs = 0; iDs < this->Surfaces->size(); iDs++)
......@@ -1508,7 +1508,7 @@ vtkIntArray* vtkLagrangianBasicIntegrationModel::GetSurfaceArrayTypes()
this->SurfaceArrayTypes->SetNumberOfValues(0);
std::map<std::string, SurfaceArrayDescription>::const_iterator it;
for (it = this->SurfaceArrayDescriptions.begin(); it !=
this->SurfaceArrayDescriptions.end(); it++)
this->SurfaceArrayDescriptions.end(); ++it)
{
this->SurfaceArrayTypes->InsertNextValue(it->second.type);
}
......
......@@ -87,7 +87,7 @@ int vtkSpatialRepresentationFilter::RequestData(
std::set<int>::iterator it;
for ( it = this->Internal->Levels.begin();
it != this->Internal->Levels.end();
it++ )
++it )
{
if ( *it <= this->MaximumLevel )
{
......
......@@ -432,7 +432,7 @@ int vtkTemporalPathLineFilter::RequestData(
//
for (vtkTemporalPathLineFilterInternals::TrailIterator t=
this->Internals->Trails.begin();
t!=this->Internals->Trails.end(); t++)
t!=this->Internals->Trails.end(); ++t)
{
t->second->alive = 0;
t->second->updated = 0;
......@@ -518,7 +518,7 @@ int vtkTemporalPathLineFilter::RequestData(
deadIds.reserve(this->Internals->Trails.size());
for (vtkTemporalPathLineFilterInternals::TrailIterator t=
this->Internals->Trails.begin();
t!=this->Internals->Trails.end(); t++)
t!=this->Internals->Trails.end(); ++t)
{
if (!t->second->alive) deadIds.push_back(t->first);
}
......@@ -555,7 +555,7 @@ int vtkTemporalPathLineFilter::RequestData(
//
for (vtkTemporalPathLineFilterInternals::TrailIterator t=
this->Internals->Trails.begin();
t!=this->Internals->Trails.end(); t++)
t!=this->Internals->Trails.end(); ++t)
{
TrailPointer tp = t->second;
if (tp->length>0)
......
......@@ -807,7 +807,7 @@ int vtkDataSetRegionSurfaceFilter::UnstructuredGridExecute(vtkDataSet *dataSetIn
std::map<std::pair<int,int>, int>::iterator it;
for (it = this->Internal->NewRegions.begin();
it != this->Internal->NewRegions.end();
it++)
++it)
{
int index = it->second;
outMaterialIDs->SetValue(index, index);
......
......@@ -155,7 +155,7 @@ void vtkDSPFilterGroup::RemoveFilter(char *a_outputVariableName)
std::vector< std::vector<vtkFloatArray *> >::iterator l_cachedOutputsIter = this->CachedOutputs->m_vector.begin();
std::vector< std::vector<int> >::iterator l_cachedOutputTimesIter = this->CachedOutputTimesteps->m_vector.begin();
for(l_iter=this->FilterDefinitions->m_vector.begin();l_iter!=this->FilterDefinitions->m_vector.end();l_iter++)
for(l_iter=this->FilterDefinitions->m_vector.begin();l_iter!=this->FilterDefinitions->m_vector.end();++l_iter)
{
if(!strcmp(a_outputVariableName,(*l_iter)->GetOutputVariableName()))
{
......@@ -167,8 +167,8 @@ void vtkDSPFilterGroup::RemoveFilter(char *a_outputVariableName)
this->CachedOutputTimesteps->m_vector.erase(l_cachedOutputTimesIter);
break;
}
l_cachedOutputsIter++;
l_cachedOutputTimesIter++;
++l_cachedOutputsIter;
++l_cachedOutputTimesIter;
}
#if 0
......
......@@ -417,7 +417,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
for(VectorIterator = this->mefi->PutArrNames.begin();
VectorIterator != this->mefi->PutArrNames.end();
VectorIterator++)
++VectorIterator)
{
currentArray = 0;
......@@ -479,7 +479,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
for(VectorIterator = this->mefi->GetArrNames.begin();
VectorIterator != this->mefi->GetArrNames.end();
VectorIterator++)
++VectorIterator)
{
currentArray = this->mengi->GetVtkDataArray(VectorIterator->MatArrName.c_str());
......@@ -572,7 +572,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
for(VectorIterator = this->mefi->PutArrNames.begin();
VectorIterator != this->mefi->PutArrNames.end();
VectorIterator++)
++VectorIterator)
{
currentArray = PointinFD->GetArray(VectorIterator->VTKArrName.c_str());
......@@ -635,7 +635,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
for(VectorIterator = this->mefi->GetArrNames.begin();
VectorIterator != this->mefi->GetArrNames.end();
VectorIterator++){
++VectorIterator){
currentArray = this->mengi->GetVtkDataArray(VectorIterator->MatArrName.c_str());
if(!currentArray)
......@@ -678,7 +678,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
{
for(VectorIterator = this->mefi->PutArrNames.begin();
VectorIterator != this->mefi->PutArrNames.end();
VectorIterator++)
++VectorIterator)
{
int index = atoi(VectorIterator->VTKArrName.c_str());
......@@ -733,7 +733,7 @@ int vtkMatlabEngineFilter::RequestData(vtkInformation *vtkNotUsed(request),
for(VectorIterator = this->mefi->GetArrNames.begin();
VectorIterator != this->mefi->GetArrNames.end();
VectorIterator++)
++VectorIterator)
{
cArray = this->mengi->GetVtkArray(VectorIterator->MatArrName.c_str());
......@@ -787,7 +787,7 @@ int vtkMatlabEngineFilter::ProcessDataSet(vtkDataSet* dsinp, vtkDataSet* dsout)
for(VectorIterator = this->mefi->PutArrNames.begin();
VectorIterator != this->mefi->PutArrNames.end();
VectorIterator++)
++VectorIterator)
{
currentArray = PointinFD->GetArray(VectorIterator->VTKArrName.c_str());
......@@ -849,7 +849,7 @@ int vtkMatlabEngineFilter::ProcessDataSet(vtkDataSet* dsinp, vtkDataSet* dsout)
for(VectorIterator = this->mefi->GetArrNames.begin();
VectorIterator != this->mefi->GetArrNames.end();
VectorIterator++)
++VectorIterator)
{
currentArray = this->mengi->GetVtkDataArray(VectorIterator->MatArrName.c_str());
......
......@@ -152,7 +152,7 @@ int vtkAggregateDataSetFilter::RequestData(
{
vtkNew<vtkAppendPolyData> appendFilter;
for (std::vector<vtkSmartPointer<vtkDataObject> >::iterator it=recvBuffer.begin();
it!=recvBuffer.end();it++)
it!=recvBuffer.end();++it)
{
appendFilter->AddInputData(vtkPolyData::SafeDownCast(*it));
}
......@@ -164,7 +164,7 @@ int vtkAggregateDataSetFilter::RequestData(
vtkNew<vtkAppendFilter> appendFilter;
appendFilter->MergePointsOn();
for (std::vector<vtkSmartPointer<vtkDataObject> >::iterator it=recvBuffer.begin();
it!=recvBuffer.end();it++)
it!=recvBuffer.end();++it)
{
appendFilter->AddInputData(*it);
}
......
......@@ -285,7 +285,7 @@ public:
}
else
{
it++;
++it;
}
}
}
......
......@@ -357,7 +357,7 @@ bool vtkPParticleTracerBase::SendReceiveParticles(RemoteParticleVector &sParticl
//read the message for the particles that we really want
int counter = 0;
for(std::vector<vtkIdType>::iterator it=realOwningProcess.begin();
it!=realOwningProcess.end();it++)
it!=realOwningProcess.end();++it)
{
if(*it != -1)
{
......@@ -484,7 +484,7 @@ bool vtkPParticleTracerBase::IsPointDataValid(vtkDataObject* input)
{
stream << (int)arrayNames.size();
for(std::vector<std::string>::iterator it=arrayNames.begin();
it!=arrayNames.end();it++)
it!=arrayNames.end();++it)
{
stream << *it;
}
......
......@@ -1234,7 +1234,7 @@ namespace
~TaskManager()
{
for( BufferList::iterator itr=SendBuffers.begin();itr!=SendBuffers.end();itr++)
for( BufferList::iterator itr=SendBuffers.begin();itr!=SendBuffers.end();++itr)
{
MessageBuffer* buf = *itr;
AssertNe(buf->GetRequest().Test(),0);
......@@ -1352,7 +1352,7 @@ namespace
{
MessageBuffer* buf(*itr);
BufferList::iterator next = itr;
next++;
++next;
if(buf->GetRequest().Test())
{
delete buf;
......@@ -1648,7 +1648,7 @@ int vtkPStreamTracer::RequestData(
// container. We append them all together here.
vtkNew<vtkAppendPolyData> append;
for (traceOutputsType::iterator it = traceOutputs.begin();
it != traceOutputs.end(); it++)
it != traceOutputs.end(); ++it)
{
vtkPolyData* inp = it->GetPointer();
if ( inp->GetNumberOfCells() > 0 )
......
......@@ -787,7 +787,7 @@ void vtkPUnstructuredGridGhostCellsGenerator::FindGhostCells()
// iterate over all cells sent to toRank
std::set<vtkIdType>::iterator cellidIter = cellids.begin();
for (; cellidIter != cellids.end(); cellidIter++)
for (; cellidIter != cellids.end(); ++cellidIter)
{
// iterate over each point in the cell
vtkIdType cellid = *cellidIter;
......@@ -827,7 +827,7 @@ void vtkPUnstructuredGridGhostCellsGenerator::FindGhostCells()
int toRank = iter->first;
std::set<vtkIdType>& cellids = this->Internals->CellsToSend[toRank];
std::set<vtkIdType>::iterator cellidIter = cellids.begin();
for (; cellidIter != cellids.end(); cellidIter++)
for (; cellidIter != cellids.end(); ++cellidIter)
{
this->Internals->SentCells[toRank].insert(*cellidIter);
this->Internals->SentCellsLastRound[toRank].insert(*cellidIter);
......
......@@ -353,7 +353,7 @@ int vtkSelectionSource::RequestData(
// iterate over ids and insert to the selection list
vtkSelectionSourceInternals::StringIDSetType::iterator iter =
selSet.begin();
for (vtkIdType idx2=0; iter != selSet.end(); iter++, idx2++)
for (vtkIdType idx2=0; iter != selSet.end(); ++iter, ++idx2)
{
selectionList->SetValue(idx2, *iter);
}
......@@ -415,7 +415,7 @@ int vtkSelectionSource::RequestData(
// iterate over ids and insert to the selection list
vtkSelectionSourceInternals::IDSetType::iterator iter =
selSet.begin();
for (vtkIdType idx2=0; iter != selSet.end(); iter++, idx2++)
for (vtkIdType idx2=0; iter != selSet.end(); ++iter, ++idx2)
{
selectionList->SetValue(idx2, *iter);
}
......
......@@ -588,14 +588,14 @@ void vtkKMeansStatistics::Derive( vtkMultiBlockDataSet* outMeta )
localRank->SetNumberOfValues( totalClusterRunIDs->GetNumberOfTuples() );
int rankID=1;
for( std::multimap<double, vtkIdType>::iterator itr = globalErrorMap.begin(); itr != globalErrorMap.end(); itr++ )
for( std::multimap<double, vtkIdType>::iterator itr = globalErrorMap.begin(); itr != globalErrorMap.end(); ++itr )
{
globalRank->SetValue( itr->second, rankID++ ) ;
}
for( std::map<vtkIdType, std::multimap<double, vtkIdType> >::iterator itr = localErrorMap.begin(); itr != localErrorMap.end(); itr++ )
for( std::map<vtkIdType, std::multimap<double, vtkIdType> >::iterator itr = localErrorMap.begin(); itr != localErrorMap.end(); ++itr )
{
rankID=1;
for( std::multimap<double, vtkIdType>::iterator rItr = itr->second.begin(); rItr != itr->second.end(); rItr++ )
for( std::multimap<double, vtkIdType>::iterator rItr = itr->second.begin(); rItr != itr->second.end(); ++rItr )
{