cyclegraph: bugfix - pop edges properly

Now that CycleNode's have back-edges, we need to properly remove *both*
the forward and back edges when doing roll-back.

diff --git a/cyclegraph.cc b/cyclegraph.cc
index eaddc8e1714629f8834a5b11c891f8009b2e1237..e834cb672b5a360077c9cb877ea164a986880acb 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -348,7 +348,7 @@ void CycleGraph::commitChanges()
 void CycleGraph::rollbackChanges()
 {
        for (unsigned int i = 0; i < rollbackvector.size(); i++)
-               rollbackvector[i]->popEdge();
+               rollbackvector[i]->removeEdge();
 
        for (unsigned int i = 0; i < rmwrollbackvector.size(); i++)
                rmwrollbackvector[i]->clearRMW();

diff --git a/cyclegraph.h b/cyclegraph.h
index 749abf8ca847d9969016356101b153c4d0688a84..fcb1d30960843413814b07796c015866100cabf7 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -102,11 +102,6 @@ class CycleNode {
        void clearRMW() { hasRMW = NULL; }
        const ModelAction * getAction() const { return action; }
        const Promise * getPromise() const { return promise; }
-
-       void popEdge() {
-               edges.pop_back();
-       }
-
        bool is_promise() const { return !action; }
        void resolvePromise(const ModelAction *writer);