summaryrefslogtreecommitdiff
path: root/utils/hash.h
diff options
context:
space:
mode:
Diffstat (limited to 'utils/hash.h')
-rwxr-xr-xutils/hash.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/hash.h b/utils/hash.h
index 17f150ff..2062578f 100755
--- a/utils/hash.h
+++ b/utils/hash.h
@@ -32,9 +32,9 @@ const unsigned GOLDEN_MEAN_FRACTION=2654435769U;
template <class C>
struct murmur_hash
{
- typedef MurmurInt return_type;
+ typedef MurmurInt result_type;
typedef C /*const&*/ argument_type;
- return_type operator()(argument_type const& c) const {
+ result_type operator()(argument_type const& c) const {
return MurmurHash((void*)&c,sizeof(c));
}
};
@@ -43,9 +43,9 @@ struct murmur_hash
template <>
struct murmur_hash<std::string>
{
- typedef MurmurInt return_type;
+ typedef MurmurInt result_type;
typedef std::string /*const&*/ argument_type;
- return_type operator()(argument_type const& c) const {
+ result_type operator()(argument_type const& c) const {
return MurmurHash(c.data(),c.size());
}
};
@@ -54,9 +54,9 @@ struct murmur_hash<std::string>
template <class C>
struct murmur_hash_array
{
- typedef MurmurInt return_type;
+ typedef MurmurInt result_type;
typedef C /*const&*/ argument_type;
- return_type operator()(argument_type const& c) const {
+ result_type operator()(argument_type const& c) const {
return MurmurHash(&*c.begin(),c.size()*sizeof(*c.begin()));
}
};