1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (hash): defaulted to MurmurHash 2.0.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-19 08:32:41 +00:00
parent 4e6ad7d910
commit 42d9223a2d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Jan 19 17:33:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (hash): defaulted to MurmurHash 2.0.
Mon Jan 19 17:29:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added.

4
string.c
View File

@ -1883,7 +1883,7 @@ rb_str_concat(VALUE str1, VALUE str2)
/* MurmurHash described in http://murmurhash.googlepages.com/ */
#ifndef MURMUR
#define MURMUR 1
#define MURMUR 2
#endif
#define MurmurMagic 0x7fd652ad
@ -2032,7 +2032,7 @@ hash(const unsigned char * data, int len, unsigned int h)
#endif
#if MURMUR == 1
h = murmur_step(h, t);
#elif MURMUR1 == 2
#elif MURMUR == 2
h ^= t;
h *= MurmurMagic;
#endif