Skip to content
Snippets Groups Projects
Commit 8829df51 authored by Ballabriga Clément's avatar Ballabriga Clément
Browse files

Fix compilation errors with various iterator types

parent 28171cb0
No related branches found
No related tags found
No related merge requests found
......@@ -75,8 +75,8 @@ XCFGVisitor<D>::XCFGVisitor(const CFGCollection& _cfgs, D& domain)
// Record nodes and CFG next nodes
int bbi = 0, cfgi = 0;
for(CFGCollection::Iter cfg(cfgs); cfg; cfg++, cfgi++)
for(CFG::BlockIter bb = cfg->blocks(); bb; bb++, bbi++) {
for(CFGCollection::Iter cfg(cfgs); cfg(); cfg++, cfgi++)
for(CFG::BlockIter bb = cfg->blocks(); bb(); bb++, bbi++) {
nodes[bbi].bb = bb;
nodes[bbi].cfg = cfgi;
if(bb->isSynth()) {
......@@ -94,7 +94,7 @@ template <class D>
XCFGVisitor<D>::~XCFGVisitor(void) {
// Release INDEX on CFGs
for(CFGCollection::Iter cfg(cfgs); cfg; cfg++)
for(CFGCollection::Iter cfg(cfgs); cfg(); cfg++)
cfg->removeProp(&INDEX);
// Free memory
......@@ -115,7 +115,7 @@ void XCFGVisitor<D>::visitPreds(XIterativeDFA< XCFGVisitor<D> >& engine, int nod
else if(info.from != -1)
engine.nextPred(info.from);
else
for(BasicBlock::EdgeIter edge = info.bb->ins(); edge; edge++)
for(BasicBlock::EdgeIter edge = info.bb->ins(); edge(); edge++)
engine.nextPred(offs[info.cfg] + edge->source()->index());
}
......
......@@ -273,7 +273,7 @@ inline int WideningFixPoint<Listener>::collect2(Block* bb, const GC *gc) const {
// mark all the states on edge going out from bb
int i = 0;
for(Block::EdgeIter out = bb->ins(); out; out++) {
for(Block::EdgeIter out = bb->ins(); out(); out++) {
typename Listener::Problem::Domain* s = *STATE(*out);
if (s != 0) {
s->collect(gc);
......
......@@ -65,7 +65,7 @@ public:
: _prob(prob), _set(set), _id(id) {
const CFGCollection *col = INVOLVED_CFGS(ws);
for(int i = 0; i < col->count(); i++)
for(CFG::BlockIter bb = col->get(i)->blocks(); bb; bb++)
for(CFG::BlockIter bb = col->get(i)->blocks(); bb(); bb++)
prob.init(_id(bb)[_set], prob.bottom());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment