CDMap -> CDHashMap

CDSet -> CDHashSet

3 files changed, 12 insertions, 12 deletions

diff --git a/src/util/congruence_closure.h b/src/util/congruence_closure.h
index 4e690ec16..ed1cecd7b 100644
--- a/src/util/congruence_closure.h
+++ b/src/util/congruence_closure.h
@@ -30,8 +30,8 @@
 #include "expr/node.h"
 #include "context/context_mm.h"
 #include "context/cdo.h"
-#include "context/cdmap.h"
-#include "context/cdset.h"
+#include "context/cdhashmap.h"
+#include "context/cdhashset.h"
 #include "context/cdlist_context_memory.h"
 #include "util/exception.h"
 #include "context/stacking_map.h"
@@ -141,15 +141,15 @@ class CongruenceClosure {
   // typedef all of these so that iterators are easy to define
   typedef context::StackingMap<Node, Node, NodeHashFunction> RepresentativeMap;
   typedef context::CDList<TNode, context::ContextMemoryAllocator<TNode> > ClassList;
-  typedef context::CDMap<Node, ClassList*, NodeHashFunction> ClassLists;
+  typedef context::CDHashMap<Node, ClassList*, NodeHashFunction> ClassLists;
   typedef context::CDList<TNode, context::ContextMemoryAllocator<TNode> > UseList;
-  typedef context::CDMap<TNode, UseList*, TNodeHashFunction> UseLists;
-  typedef context::CDMap<Node, Node, NodeHashFunction> LookupMap;
+  typedef context::CDHashMap<TNode, UseList*, TNodeHashFunction> UseLists;
+  typedef context::CDHashMap<Node, Node, NodeHashFunction> LookupMap;
 
   typedef __gnu_cxx::hash_map<TNode, Node, TNodeHashFunction> EqMap;
 
-  typedef context::CDMap<Node, Node, NodeHashFunction> ProofMap;
-  typedef context::CDMap<Node, Node, NodeHashFunction> ProofLabel;
+  typedef context::CDHashMap<Node, Node, NodeHashFunction> ProofMap;
+  typedef context::CDHashMap<Node, Node, NodeHashFunction> ProofLabel;
 
   // Simple, NON-context-dependent pending list, union find and "seen
   // set" types for constructing explanations and
@@ -164,7 +164,7 @@ class CongruenceClosure {
   LookupMap d_lookup;
 
   EqMap d_eqMap;
-  context::CDSet<TNode, TNodeHashFunction> d_added;
+  context::CDHashSet<TNode, TNodeHashFunction> d_added;
 
   ProofMap d_proof;
   ProofLabel d_proofLabel;
@@ -175,7 +175,7 @@ class CongruenceClosure {
    * The set of terms we care about (i.e. those that have been given
    * us with addTerm() and their representatives).
    */
-  typedef context::CDSet<TNode, TNodeHashFunction> CareSet;
+  typedef context::CDHashSet<TNode, TNodeHashFunction> CareSet;
   CareSet d_careSet;
 
   // === STATISTICS ===
diff --git a/src/util/trans_closure.cpp b/src/util/trans_closure.cpp
index 5d772b576..ba289080c 100644
--- a/src/util/trans_closure.cpp
+++ b/src/util/trans_closure.cpp
@@ -98,7 +98,7 @@ void TransitiveClosure::debugPrintMatrix()
 }
 
 unsigned TransitiveClosureNode::getId( Node i ){
-  context::CDMap< Node, unsigned, NodeHashFunction >::iterator it = nodeMap.find( i );
+  context::CDHashMap< Node, unsigned, NodeHashFunction >::iterator it = nodeMap.find( i );
   if( it==nodeMap.end() ){
     unsigned c = d_counter.get();
     nodeMap[i] = c;
diff --git a/src/util/trans_closure.h b/src/util/trans_closure.h
index a551d4a31..3cb3385dd 100644
--- a/src/util/trans_closure.h
+++ b/src/util/trans_closure.h
@@ -26,7 +26,7 @@
 #include <map>
 
 #include "context/cdlist.h"
-#include "context/cdmap.h"
+#include "context/cdhashmap.h"
 #include "context/cdo.h"
 
 namespace CVC4 {
@@ -128,7 +128,7 @@ public:
  */
 class TransitiveClosureNode : public TransitiveClosure{
   context::CDO< unsigned > d_counter;
-  context::CDMap< Node, unsigned, NodeHashFunction > nodeMap;
+  context::CDHashMap< Node, unsigned, NodeHashFunction > nodeMap;
   //for debugging
   context::CDList< std::pair< Node, Node > > currEdges;
 public: