diff options
| author | Tim King <taking@google.com> | 2017-07-20 18:00:11 -0700 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2017-07-20 18:00:11 -0700 |
| commit | 26a2fcf1413a02788dc25745fac87eb610b5a55d (patch) | |
| tree | 21e7db3d7707a5be944124cb5959656ba9e2ee36 /src/proof/proof_manager.h | |
| parent | 8cf852387cb3a6ec17e77e61956030ca0c4c3837 (diff) | |
| parent | 8b0659e6cd342ae40b676781b5e819d5fd2b3af7 (diff) | |
Merge branch 'master' into cleanup-regexp
Diffstat (limited to 'src/proof/proof_manager.h')
| -rw-r--r-- | src/proof/proof_manager.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h index 2510b770a..f77a96726 100644 --- a/src/proof/proof_manager.h +++ b/src/proof/proof_manager.h @@ -20,7 +20,9 @@ #define __CVC4__PROOF_MANAGER_H #include <iosfwd> -#include <map> +#include <unordered_map> +#include <unordered_set> + #include "expr/node.h" #include "context/cdhashset.h" #include "context/cdhashmap.h" @@ -96,13 +98,11 @@ enum ProofFormat { std::string append(const std::string& str, uint64_t num); -typedef __gnu_cxx::hash_map < ClauseId, prop::SatClause* > IdToSatClause; -typedef __gnu_cxx::hash_set<Expr, ExprHashFunction> ExprSet; +typedef std::unordered_map<ClauseId, prop::SatClause*> IdToSatClause; typedef context::CDHashSet<Expr, ExprHashFunction> CDExprSet; -typedef __gnu_cxx::hash_set<Node, NodeHashFunction > NodeSet; -typedef __gnu_cxx::hash_map<Node, std::vector<Node>, NodeHashFunction > NodeToNodes; -typedef context::CDHashMap<Node, std::vector<Node>, NodeHashFunction > CDNodeToNodes; -typedef std::hash_set<ClauseId> IdHashSet; +typedef std::unordered_map<Node, std::vector<Node>, NodeHashFunction> NodeToNodes; +typedef context::CDHashMap<Node, std::vector<Node>, NodeHashFunction> CDNodeToNodes; +typedef std::unordered_set<ClauseId> IdHashSet; enum ProofRule { RULE_GIVEN, /* input assertion */ |