diff options
| author | Gereon Kremer <gkremer@stanford.edu> | 2021-04-27 07:31:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 05:31:58 +0000 |
| commit | 20820daece2eaf340a944ff386ffbafed1b79b75 (patch) | |
| tree | fc7865a1bb468fa4d3749052f65106d15532dd31 /src/expr | |
| parent | baeb7af81166d709bfbbc7b8da13ac238c1e9579 (diff) | |
Use std::hash for API types (#6432)
This PR replaces all api::*HashFunction objects by specializations of std::hash. std::hash is meant to be extended in this way, and it allows for a much cleaner usage of std::unordered_set and std::unordered_map with these types.
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/symbol_manager.cpp | 4 | ||||
| -rw-r--r-- | src/expr/symbol_table.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/expr/symbol_manager.cpp b/src/expr/symbol_manager.cpp index 4e9b7822b..c6eb8d08e 100644 --- a/src/expr/symbol_manager.cpp +++ b/src/expr/symbol_manager.cpp @@ -28,8 +28,8 @@ namespace cvc5 { class SymbolManager::Implementation { - using TermStringMap = CDHashMap<api::Term, std::string, api::TermHashFunction>; - using TermSet = CDHashSet<api::Term, api::TermHashFunction>; + using TermStringMap = CDHashMap<api::Term, std::string, std::hash<api::Term>>; + using TermSet = CDHashSet<api::Term, std::hash<api::Term>>; using SortList = CDList<api::Sort>; using TermList = CDList<api::Term>; diff --git a/src/expr/symbol_table.cpp b/src/expr/symbol_table.cpp index 9e1fe9582..762120b5b 100644 --- a/src/expr/symbol_table.cpp +++ b/src/expr/symbol_table.cpp @@ -91,7 +91,7 @@ class OverloadedTypeTrie { public: OverloadedTypeTrie(Context* c, bool allowFunVariants = false) : d_overloaded_symbols( - new (true) CDHashSet<api::Term, api::TermHashFunction>(c)), + new (true) CDHashSet<api::Term, std::hash<api::Term>>(c)), d_allowFunctionVariants(allowFunVariants) { } @@ -153,7 +153,7 @@ class OverloadedTypeTrie { * above. */ std::unordered_map<std::string, TypeArgTrie> d_overload_type_arg_trie; /** The set of overloaded symbols. */ - CDHashSet<api::Term, api::TermHashFunction>* d_overloaded_symbols; + CDHashSet<api::Term, std::hash<api::Term>>* d_overloaded_symbols; /** allow function variants * This is true if we allow overloading (non-constant) functions that expect * the same argument types. |