summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-19 18:42:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-19 18:42:46 +0000
commitd66c0cf36843b44461faef59d554c15e740e88ac (patch)
tree2e51e3800a9ddc4bb710cf889202b1819e3519ac
parent108377fc6bf8c7279b969cca973e07a8d6bda62e (diff)
* string.c (hash): fixed typo. [ruby-dev:37791]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91ebd3cffa0..258a86dfc43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 20 03:42:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (hash): fixed typo. [ruby-dev:37791]
+
Tue Jan 20 01:15:27 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb (SOMAXCONN): defined.
diff --git a/string.c b/string.c
index f6027df0763..1764d69c8ae 100644
--- a/string.c
+++ b/string.c
@@ -1973,7 +1973,7 @@ hash(const unsigned char * data, int len, unsigned int h)
#else
t = (t >> sr) | (d << sl);
#endif
- h = murmur(h, t);
+ h = murmur_step(h, t);
t = d;
data += sizeof(uint32_t);
len -= sizeof(uint32_t);