From 1eab70e16f0e0d5531f3babfea2062c82f6362e1 Mon Sep 17 00:00:00 2001
From: graehl <graehl@ec762483-ff6d-05da-a07a-a48fb63a330f>
Date: Fri, 27 Aug 2010 19:26:31 +0000
Subject: compiles

git-svn-id: https://ws10smt.googlecode.com/svn/trunk@626 ec762483-ff6d-05da-a07a-a48fb63a330f
---
 utils/hash.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'utils/hash.h')

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()));
   }
 };
-- 
cgit v1.2.3