Explicitly make the hash type a 64bit integer

thomasmoelhave · May 30, 2012 · f9a4951 · f9a4951
1 parent ec3dbf5
commit f9a4951
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/tpie/prime.cpp b/tpie/prime.cpp
@@ -61,8 +61,8 @@ struct is_prime_t {
 		return true;
 	}
 
-	inline size_t prime_hash(const std::string & x) {
-		size_t r=42;
+	inline hash_type prime_hash(const std::string & x) {
+		hash_type r=42;
 		for(size_t i=0; i < x.size(); ++i)
 			r = r*m_pr[i % m_pr.size()] + x[i];
 		return r;
@@ -80,8 +80,7 @@ void finish_prime() {is_prime_ins.free();}
 
 bool is_prime(size_type i) {return is_prime_ins(i);}
 
-size_t prime_hash(const std::string & s) {return is_prime_ins.prime_hash(s);}
-
+hash_type prime_hash(const std::string & s) {return is_prime_ins.prime_hash(s);}
 
 size_t next_prime(size_t i)  {
 	while(!is_prime(i)) ++i;

diff --git a/tpie/prime.h b/tpie/prime.h
@@ -47,13 +47,15 @@ void finish_prime();
 ///////////////////////////////////////////////////////////////////////////////
 bool is_prime(size_type i);
 
+typedef boost::uint64_t hash_type;
+
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief Calculate a fairly good string hash based on prime numbers.
 ///
 /// \param s The string to hash.
 /// \return The hash value.
 ///////////////////////////////////////////////////////////////////////////////
-size_t prime_hash(const std::string & s);
+hash_type prime_hash(const std::string & s);
 
 ///////////////////////////////////////////////////////////////////////////////
 /// \brief Get next prime.