4 files changed, 12 insertions, 14 deletions
diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h
index 1db635cda..f1b7c8a83 100644
--- a/src/theory/fp/fp_converter.h
+++ b/src/theory/fp/fp_converter.h
@@ -323,11 +323,11 @@ class FpConverter
   typedef symfpuSymbolic::traits::ubv ubv;
   typedef symfpuSymbolic::traits::sbv sbv;
 
-  typedef context::CDHashMap<Node, uf, NodeHashFunction> fpMap;
-  typedef context::CDHashMap<Node, rm, NodeHashFunction> rmMap;
-  typedef context::CDHashMap<Node, prop, NodeHashFunction> boolMap;
-  typedef context::CDHashMap<Node, ubv, NodeHashFunction> ubvMap;
-  typedef context::CDHashMap<Node, sbv, NodeHashFunction> sbvMap;
+  typedef context::CDHashMap<Node, uf> fpMap;
+  typedef context::CDHashMap<Node, rm> rmMap;
+  typedef context::CDHashMap<Node, prop> boolMap;
+  typedef context::CDHashMap<Node, ubv> ubvMap;
+  typedef context::CDHashMap<Node, sbv> sbvMap;
 
   fpMap d_fpMap;
   rmMap d_rmMap;
diff --git a/src/theory/fp/fp_expand_defs.h b/src/theory/fp/fp_expand_defs.h
index 674d79331..a9edc8b02 100644
--- a/src/theory/fp/fp_expand_defs.h
+++ b/src/theory/fp/fp_expand_defs.h
@@ -33,11 +33,10 @@ class FpExpandDefs
 {
   using PairTypeNodeHashFunction = PairHashFunction<TypeNode,
                                                     TypeNode,
-                                                    TypeNodeHashFunction,
-                                                    TypeNodeHashFunction>;
+                                                    std::hash<TypeNode>,
+                                                    std::hash<TypeNode>>;
   /** Uninterpreted functions for undefined cases of non-total operators. */
-  using ComparisonUFMap =
-      context::CDHashMap<TypeNode, Node, TypeNodeHashFunction>;
+  using ComparisonUFMap = context::CDHashMap<TypeNode, Node>;
   /** Uninterpreted functions for lazy handling of conversions. */
   using ConversionUFMap = context::
       CDHashMap<std::pair<TypeNode, TypeNode>, Node, PairTypeNodeHashFunction>;
diff --git a/src/theory/fp/theory_fp.cpp b/src/theory/fp/theory_fp.cpp
index 01dace411..21f2975a8 100644
--- a/src/theory/fp/theory_fp.cpp
+++ b/src/theory/fp/theory_fp.cpp
@@ -804,7 +804,7 @@ bool TheoryFp::collectModelValues(TheoryModel* m,
     }
   }
 
-  std::unordered_set<TNode, TNodeHashFunction> visited;
+  std::unordered_set<TNode> visited;
   std::stack<TNode> working;
   std::set<TNode> relevantVariables;
   for (std::set<Node>::const_iterator i(relevantTerms.begin());
diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h
index 8cf4c4cc5..a41bf342c 100644
--- a/src/theory/fp/theory_fp.h
+++ b/src/theory/fp/theory_fp.h
@@ -92,9 +92,8 @@ class TheoryFp : public Theory
   TrustNode explain(TNode n) override;
 
  protected:
-  using ConversionAbstractionMap =
-      context::CDHashMap<TypeNode, Node, TypeNodeHashFunction>;
-  using AbstractionMap = context::CDHashMap<Node, Node, NodeHashFunction>;
+  using ConversionAbstractionMap = context::CDHashMap<TypeNode, Node>;
+  using AbstractionMap = context::CDHashMap<Node, Node>;
 
   /** Equality engine. */
   class NotifyClass : public eq::EqualityEngineNotify {
@@ -121,7 +120,7 @@ class TheoryFp : public Theory
   void registerTerm(TNode node);
   bool isRegistered(TNode node);
 
-  context::CDHashSet<Node, NodeHashFunction> d_registeredTerms;
+  context::CDHashSet<Node> d_registeredTerms;
 
   /** The word-blaster. Translates FP -> BV. */
   std::unique_ptr<FpConverter> d_conv;