diff options
Diffstat (limited to 'src/prop')
-rw-r--r-- | src/prop/bvminisat/mtl/Map.h | 9 | ||||
-rw-r--r-- | src/prop/minisat/core/SolverTypes.h | 1 | ||||
-rw-r--r-- | src/prop/minisat/mtl/Map.h | 9 | ||||
-rw-r--r-- | src/prop/sat_solver.h | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/src/prop/bvminisat/mtl/Map.h b/src/prop/bvminisat/mtl/Map.h index 8bd5659bc..4e61d6582 100644 --- a/src/prop/bvminisat/mtl/Map.h +++ b/src/prop/bvminisat/mtl/Map.h @@ -29,16 +29,17 @@ namespace BVMinisat { // 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; } //================================================================================================= 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; } //================================================================================================= diff --git a/src/prop/sat_solver.h b/src/prop/sat_solver.h index b71844590..8effa8189 100644 --- a/src/prop/sat_solver.h +++ b/src/prop/sat_solver.h @@ -36,7 +36,7 @@ class SatSolver { public: /** Virtual destructor */ - virtual ~SatSolver() { } + virtual ~SatSolver() throw(AssertionException) { } /** Assert a clause in the solver. */ virtual void addClause(SatClause& clause, bool removable, uint64_t proof_id) = 0; @@ -80,6 +80,7 @@ public: class BVSatSolverInterface: public SatSolver { public: + virtual ~BVSatSolverInterface() throw(AssertionException) {} /** Interface for notifications */ class Notify { public: |