CDMap -> CDHashMap

CDSet -> CDHashSet

2 files changed, 6 insertions, 6 deletions

diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 3c320b814..8b5a93fa9 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -25,7 +25,7 @@
 #include <ext/hash_map>
 
 #include "context/cdlist.h"
-#include "context/cdset.h"
+#include "context/cdhashset.h"
 #include "context/context.h"
 #include "expr/command.h"
 #include "expr/expr.h"
@@ -124,7 +124,7 @@ class SmtEnginePrivate {
   theory::SubstitutionMap d_topLevelSubstitutions;
 
   /**
-   * The last substition that the SAT layer was told about.
+   * The last substitution that the SAT layer was told about.
    * In incremental settings, substitutions cannot be performed
    * "backward," only forward.  So SAT needs to be told of all
    * substitutions that are going to be done.  This iterator
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h
index 84d6d1a73..5149ed2e9 100644
--- a/src/smt/smt_engine.h
+++ b/src/smt/smt_engine.h
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "context/cdlist_forward.h"
-#include "context/cdmap_forward.h"
-#include "context/cdset_forward.h"
+#include "context/cdhashmap_forward.h"
+#include "context/cdhashset_forward.h"
 #include "expr/expr.h"
 #include "expr/expr_manager.h"
 #include "util/proof.h"
@@ -89,12 +89,12 @@ namespace smt {
 class CVC4_PUBLIC SmtEngine {
 
   /** The type of our internal map of defined functions */
-  typedef context::CDMap<Node, smt::DefinedFunction, NodeHashFunction>
+  typedef context::CDHashMap<Node, smt::DefinedFunction, NodeHashFunction>
     DefinedFunctionMap;
   /** The type of our internal assertion list */
   typedef context::CDList<Expr> AssertionList;
   /** The type of our internal assignment set */
-  typedef context::CDSet<Node, NodeHashFunction> AssignmentSet;
+  typedef context::CDHashSet<Node, NodeHashFunction> AssignmentSet;
 
   /** Expr manager context */
   context::Context* d_context;