diff options
| author | Clark Barrett <clarkbarrett@google.com> | 2015-04-21 16:34:15 -0700 |
|---|---|---|
| committer | Clark Barrett <clarkbarrett@google.com> | 2015-04-21 16:34:15 -0700 |
| commit | d95fe7675e20eaee86b8e804469e6db83265a005 (patch) | |
| tree | 34616ecdc217d608b97d9432a368b20c75039542 /src/prop/minisat | |
| parent | 22601bce9648a8e784527e4e5d176f634d234797 (diff) | |
Changes needed to compile at Google, plus some bug fixes from Google.
Diffstat (limited to 'src/prop/minisat')
| -rw-r--r-- | src/prop/minisat/core/SolverTypes.h | 1 | ||||
| -rw-r--r-- | src/prop/minisat/mtl/Map.h | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/prop/minisat/core/SolverTypes.h b/src/prop/minisat/core/SolverTypes.h index bc60542e7..46c2666c8 100644 --- a/src/prop/minisat/core/SolverTypes.h +++ b/src/prop/minisat/core/SolverTypes.h @@ -175,6 +175,7 @@ inline std::ostream& operator <<(std::ostream& out, Minisat::lbool val) { namespace CVC4 { class ProofProxyAbstract { public: + virtual ~ProofProxyAbstract() {} virtual void updateCRef(Minisat::CRef oldref, Minisat::CRef newref) = 0; }; } diff --git a/src/prop/minisat/mtl/Map.h b/src/prop/minisat/mtl/Map.h index dda6c73d1..72563e6d3 100644 --- a/src/prop/minisat/mtl/Map.h +++ b/src/prop/minisat/mtl/Map.h @@ -29,16 +29,17 @@ namespace Minisat { // Default hash/equals functions // +static inline uint32_t hash(uint32_t x){ return x; } +static inline uint32_t hash(uint64_t x){ return (uint32_t)x; } +static inline uint32_t hash(int32_t x) { return (uint32_t)x; } +static inline uint32_t hash(int64_t x) { return (uint32_t)x; } + template<class K> struct Hash { uint32_t operator()(const K& k) const { return hash(k); } }; template<class K> struct Equal { bool operator()(const K& k1, const K& k2) const { return k1 == k2; } }; template<class K> struct DeepHash { uint32_t operator()(const K* k) const { return hash(*k); } }; template<class K> struct DeepEqual { bool operator()(const K* k1, const K* k2) const { return *k1 == *k2; } }; -static inline uint32_t hash(uint32_t x){ return x; } -static inline uint32_t hash(uint64_t x){ return (uint32_t)x; } -static inline uint32_t hash(int32_t x) { return (uint32_t)x; } -static inline uint32_t hash(int64_t x) { return (uint32_t)x; } //================================================================================================= |