X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.cc;h=e56c91285d36dd4d78374fafe9fd313ee46be0d6;hb=8eee53a1677bf0aa8a3c4769dff56d2fad1886fc;hp=966a5035a9fd484074b2a6802bff58cc119e58ae;hpb=db26d1e3370a583f8eef79194c87ba9d2ef92530;p=c11tester.git

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 966a5035..e56c9128 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -138,13 +138,13 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw)
 }
 
 void CycleGraph::addEdges(SnapList<ModelAction *> * edgeset, const ModelAction *to) {
-	for(SnapList<ModelAction*>::iterator it = edgeset->begin();it!=edgeset->end();) {
-		ModelAction *act = *it;
+	for(sllnode<ModelAction*> * it = edgeset->begin();it!=NULL;) {
+		ModelAction *act = it->getVal();
 		CycleNode *node = getNode(act);
-		SnapList<ModelAction*>::iterator it2 = it;
-		it2++;
-		for(;it2!=edgeset->end(); ) {
-			ModelAction *act2 = *it2;
+		sllnode<ModelAction*> * it2 = it;
+		it2=it2->getNext();
+		for(;it2!=NULL; ) {
+			ModelAction *act2 = it2->getVal();
 			CycleNode *node2 = getNode(act2);
 			if (checkReachable(node, node2)) {
 				it = edgeset->erase(it);
@@ -153,16 +153,16 @@ void CycleGraph::addEdges(SnapList<ModelAction *> * edgeset, const ModelAction *
 				it2 = edgeset->erase(it2);
 				goto endinnerloop;
 			}
-			it2++;
+			it2=it2->getNext();
 endinnerloop:
 			;
 		}
-		it++;
+		it=it->getNext();
 endouterloop:
 		;
 	}
-	for(SnapList<ModelAction*>::iterator it = edgeset->begin();it!=edgeset->end();it++) {
-		ModelAction *from = *it;
+	for(sllnode<ModelAction*> *it = edgeset->begin();it!=NULL;it=it->getNext()) {
+		ModelAction *from = it->getVal();
 		addEdge(from, to, from->get_tid() == to->get_tid());
 	}
 }