diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-08-07 18:38:49 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-08-07 18:38:49 +0000 |
commit | b0deae79d8bae5051a85dc15e43e7b83bc8cf9ab (patch) | |
tree | d73fa7f9fb37077853f824dcecd2a1b8e4d22837 /src/util/subrange_bound.h | |
parent | ea5acaba821790dd240db779f2340fbe5fce0b8e (diff) |
Some items from the CVC4 public interface review:
* rename DeclarationScope to SymbolTable
* rename all HashStrategy -> HashFunction (which we often have anyways)
* remove CDCircList (no one is currently using it)
Diffstat (limited to 'src/util/subrange_bound.h')
-rw-r--r-- | src/util/subrange_bound.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util/subrange_bound.h b/src/util/subrange_bound.h index 063e59a0f..5de17106d 100644 --- a/src/util/subrange_bound.h +++ b/src/util/subrange_bound.h @@ -230,15 +230,15 @@ public: };/* class SubrangeBounds */ -struct CVC4_PUBLIC SubrangeBoundsHashStrategy { - static inline size_t hash(const SubrangeBounds& bounds) { +struct CVC4_PUBLIC SubrangeBoundsHashFunction { + inline size_t operator()(const SubrangeBounds& bounds) const { // We use Integer::hash() rather than Integer::getUnsignedLong() // because the latter might overflow and throw an exception size_t l = bounds.lower.hasBound() ? bounds.lower.getBound().hash() : std::numeric_limits<size_t>::max(); size_t u = bounds.upper.hasBound() ? bounds.upper.getBound().hash() : std::numeric_limits<size_t>::max(); return l + 0x9e3779b9 + (u << 6) + (u >> 2); } -};/* struct SubrangeBoundsHashStrategy */ +};/* struct SubrangeBoundsHashFunction */ inline std::ostream& operator<<(std::ostream& out, const SubrangeBound& bound) throw() CVC4_PUBLIC; |