Get code to compile

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 2129883944bbed6185964d76f8b6951b2a1711b5..8d9c23ba9c81d48b0c1856c53b89f05eb636c3e0 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -19,9 +19,9 @@ FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
  */
 bool FuncInst::add_pred(FuncInst * other)
 {
-       func_inst_list_mt::iterator it;
-       for (it = predecessors.begin();it != predecessors.end();it++) {
-               FuncInst * inst = *it;
+       mllnode<FuncInst*> * it;
+       for (it = predecessors.begin();it != NULL;it=it->getNext()) {
+               FuncInst * inst = it->getVal();
                if (inst == other)
                        return false;
        }
@@ -32,9 +32,9 @@ bool FuncInst::add_pred(FuncInst * other)
 
 bool FuncInst::add_succ(FuncInst * other)
 {
-       func_inst_list_mt::iterator it;
-       for (it = successors.begin();it != successors.end();it++) {
-               FuncInst * inst = *it;
+       mllnode<FuncInst*>* it;
+       for (it = successors.begin();it != NULL;it=it->getNext()) {
+               FuncInst * inst = it->getVal();
                if ( inst == other )
                        return false;
        }
@@ -47,9 +47,9 @@ FuncInst * FuncInst::search_in_collision(ModelAction *act)
 {
        action_type type = act->get_type();
 
-       func_inst_list_mt::iterator it;
-       for (it = collisions.begin();it != collisions.end();it++) {
-               FuncInst * inst = *it;
+       mllnode<FuncInst*>* it;
+       for (it = collisions.begin();it != NULL;it=it->getNext()) {
+               FuncInst * inst = it->getVal();
                if ( inst->get_type() == type )
                        return inst;
        }