cyclegraph: add destructor, use 'const' appropriately

[Split from Brian Demsky's larger commit]

diff --git a/cyclegraph.cc b/cyclegraph.cc
index dad8b7acb6975b0caccc1887394788b9f9dfff04..fefd595a35e9100482e2ddabe4296d1af55ab78c 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -6,8 +6,11 @@ CycleGraph::CycleGraph() {
        hasCycles=false;
 }
 
+CycleGraph::~CycleGraph() {
+}
+
 /** Returns the CycleNode for a given ModelAction. */
-CycleNode * CycleGraph::getNode(ModelAction * action) {
+CycleNode * CycleGraph::getNode(const ModelAction * action) {
        CycleNode *node=actionToNode.get(action);
        if (node==NULL) {
                node=new CycleNode(action);
@@ -17,7 +20,7 @@ CycleNode * CycleGraph::getNode(ModelAction * action) {
 }
 
 /** Adds an edge between two ModelActions. */
-void CycleGraph::addEdge(ModelAction *from, ModelAction *to) {
+void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
        CycleNode *fromnode=getNode(from);
        CycleNode *tonode=getNode(to);
        if (!hasCycles) {
@@ -57,7 +60,7 @@ bool CycleGraph::checkForCycles() {
 }
 
 /** Constructor for a CycleNode. */
-CycleNode::CycleNode(ModelAction *modelaction) {
+CycleNode::CycleNode(const ModelAction *modelaction) {
        action=modelaction;
 }
 

diff --git a/cyclegraph.h b/cyclegraph.h
index a748c7791110f5c37837ff72131bc8901b98e4e5..a98e68c972e77cf6b615cff94521bd872df4e26a 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -12,25 +12,25 @@ class ModelAction;
 class CycleGraph {
  public:
        CycleGraph();
-       void addEdge(ModelAction *from, ModelAction *to);
+       ~CycleGraph();
+       void addEdge(const ModelAction *from, const ModelAction *to);
        bool checkForCycles();
 
  private:
-       CycleNode * getNode(ModelAction *);
-       HashTable<ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+       CycleNode * getNode(const ModelAction *);
+       HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
        bool checkReachable(CycleNode *from, CycleNode *to);
        bool hasCycles;
-
 };
 
 class CycleNode {
  public:
-       CycleNode(ModelAction *action);
+       CycleNode(const ModelAction *action);
        void addEdge(CycleNode * node);
        std::vector<CycleNode *> * getEdges();
 
  private:
-       ModelAction *action;
+       const ModelAction *action;
        std::vector<CycleNode *> edges;
 };