From: Brian Norris Date: Wed, 9 Jan 2013 00:29:17 +0000 (-0800) Subject: cyclegraph: add const X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=ecf4c35df39672c99e638045087266d2cd098cfa cyclegraph: add const --- diff --git a/cyclegraph.cc b/cyclegraph.cc index 3949b6ec..e3d0d836 100644 --- a/cyclegraph.cc +++ b/cyclegraph.cc @@ -6,7 +6,7 @@ /** Initializes a CycleGraph object. */ CycleGraph::CycleGraph() : - discovered(new HashTable(16)), + discovered(new HashTable(16)), hasCycles(false), oldCycles(false), hasRMWViolation(false), @@ -198,15 +198,15 @@ bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to) * @param to The CycleNode to reach * @return True, @a from can reach @a to; otherwise, false */ -bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) const +bool CycleGraph::checkReachable(const CycleNode *from, const CycleNode *to) const { - std::vector< CycleNode *, ModelAlloc > queue; + std::vector< const CycleNode *, ModelAlloc > queue; discovered->reset(); queue.push_back(from); discovered->put(from, from); while (!queue.empty()) { - CycleNode *node = queue.back(); + const CycleNode *node = queue.back(); queue.pop_back(); if (node == to) return true; diff --git a/cyclegraph.h b/cyclegraph.h index f2f30329..45e49fb7 100644 --- a/cyclegraph.h +++ b/cyclegraph.h @@ -42,7 +42,7 @@ class CycleGraph { private: void putNode(const ModelAction *act, CycleNode *node); CycleNode * getNode(const ModelAction *); - HashTable *discovered; + HashTable *discovered; /** @brief A table for mapping ModelActions to CycleNodes */ HashTable actionToNode; @@ -50,7 +50,7 @@ class CycleGraph { std::vector nodeList; #endif - bool checkReachable(CycleNode *from, CycleNode *to) const; + bool checkReachable(const CycleNode *from, const CycleNode *to) const; /** @brief A flag: true if this graph contains cycles */ bool hasCycles;