diff --git a/src/probabilistic/BitVector.cc b/src/probabilistic/BitVector.cc index 78c0407727..257fc9ad71 100644 --- a/src/probabilistic/BitVector.cc +++ b/src/probabilistic/BitVector.cc @@ -492,7 +492,7 @@ BitVector::size_type BitVector::FindNext(size_type i) const return block ? bi * bits_per_block + lowest_bit(block) : find_from(bi + 1); } -uint64_t BitVector::Hash() const +uint64 BitVector::Hash() const { u_char buf[SHA256_DIGEST_LENGTH]; SHA256_CTX ctx; @@ -502,7 +502,7 @@ uint64_t BitVector::Hash() const sha256_update(&ctx, &bits[i], sizeof(bits[i])); sha256_final(&ctx, buf); - return *reinterpret_cast(buf); // Use the first bytes as seed. + return *reinterpret_cast(buf); // Use the first bytes as digest. } BitVector::size_type BitVector::lowest_bit(block_type block) diff --git a/src/probabilistic/BitVector.h b/src/probabilistic/BitVector.h index 6ca0cd506a..a1ff0c9ad9 100644 --- a/src/probabilistic/BitVector.h +++ b/src/probabilistic/BitVector.h @@ -15,7 +15,7 @@ namespace probabilistic { */ class BitVector : public SerialObj { public: - typedef uint64_t block_type; + typedef uint64 block_type; typedef size_t size_type; typedef bool const_reference; @@ -281,7 +281,7 @@ public: * * @return The hash. */ - uint64_t Hash() const; + uint64 Hash() const; /** * Serializes the bit vector. diff --git a/src/probabilistic/CounterVector.cc b/src/probabilistic/CounterVector.cc index c1eea18d96..317a28d851 100644 --- a/src/probabilistic/CounterVector.cc +++ b/src/probabilistic/CounterVector.cc @@ -153,7 +153,7 @@ CounterVector operator|(const CounterVector& x, const CounterVector& y) } -uint64_t CounterVector::Hash() const +uint64 CounterVector::Hash() const { return bits->Hash(); } diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h index 1748feb17b..d3efd1aa31 100644 --- a/src/probabilistic/CounterVector.h +++ b/src/probabilistic/CounterVector.h @@ -131,7 +131,7 @@ public: * * @return The hash. */ - uint64_t Hash() const; + uint64 Hash() const; /** * Serializes the bit vector. diff --git a/src/probabilistic/Hasher.cc b/src/probabilistic/Hasher.cc index 3e42ef95ce..b497dba9be 100644 --- a/src/probabilistic/Hasher.cc +++ b/src/probabilistic/Hasher.cc @@ -10,7 +10,7 @@ using namespace probabilistic; -uint64_t Hasher::MakeSeed(const void* data, size_t size) +uint64 Hasher::MakeSeed(const void* data, size_t size) { u_char buf[SHA256_DIGEST_LENGTH]; SHA256_CTX ctx; @@ -29,7 +29,7 @@ uint64_t Hasher::MakeSeed(const void* data, size_t size) } sha256_final(&ctx, buf); - return *reinterpret_cast(buf); // Use the first bytes as seed. + return *reinterpret_cast(buf); // Use the first bytes as seed. } Hasher::digest_vector Hasher::Hash(const HashKey* key) const diff --git a/src/probabilistic/Hasher.h b/src/probabilistic/Hasher.h index c82858ded1..6128f3e04e 100644 --- a/src/probabilistic/Hasher.h +++ b/src/probabilistic/Hasher.h @@ -30,7 +30,7 @@ public: * * @return A seed suitable for hashers. */ - static uint64_t MakeSeed(const void* data, size_t size); + static uint64 MakeSeed(const void* data, size_t size); /** * Destructor.