committing the TNode/Node fix that was in the kind-backend branch; there's still...

diff --git a/src/theory/booleans/circuit_propagator.cpp b/src/theory/booleans/circuit_propagator.cpp
index 318fdeccee8c8cddd003dee6fd02a7e6bf7d3926..5f3f964de6d1e96704a9b77dcc6a014afbd993f3 100644 (file)
--- a/src/theory/booleans/circuit_propagator.cpp
+++ b/src/theory/booleans/circuit_propagator.cpp
@@ -201,11 +201,11 @@ void CircuitPropagator::propagateForward(TNode child, bool childAssignment) {
   Debug("circuit-prop") << "CircuitPropagator::propagateForward(" << child << ", " << childAssignment << ")" << endl;
 
   // Get the back any nodes where this is child
-  const vector<TNode>& parents = d_backEdges.find(child)->second;
+  const vector<Node>& parents = d_backEdges.find(child)->second;
 
   // Go through the parents and see if there is anything to propagate
-  vector<TNode>::const_iterator parent_it = parents.begin();
-  vector<TNode>::const_iterator parent_it_end = parents.end();
+  vector<Node>::const_iterator parent_it = parents.begin();
+  vector<Node>::const_iterator parent_it_end = parents.end();
   for(; parent_it != parent_it_end && !d_conflict; ++ parent_it) {
     // The current parent of the child
     TNode parent = *parent_it;

diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h
index e1e3073cebaf45c799a1d52485e65b0db6b3ba1d..2f9a8f9282a1d1aa1aadc6354913d6fc0bdf742a 100644 (file)
--- a/src/theory/booleans/circuit_propagator.h
+++ b/src/theory/booleans/circuit_propagator.h
@@ -69,7 +69,7 @@ public:
 private:
 
   /** Back edges from nodes to where they are used */
-  typedef std::hash_map<TNode, std::vector<TNode>, TNodeHashFunction> BackEdgesMap;
+  typedef std::hash_map<Node, std::vector<Node>, NodeHashFunction> BackEdgesMap;
   BackEdgesMap d_backEdges;
 
   /** The propagation queue */