motiejus/turbonss
1
Fork 0
Code Releases Activity

Dropped inline from Murmur for gcc 4.8 compatibility.

Browse Source
This commit is contained in:
Davi Reis 2013-08-26 23:32:04 -03:00
parent 4238530db6
commit c113674a89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cxxmph/MurmurHash3.cpp
View File

@ -52,12 +52,12 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )
// Block read - if your platform needs to do endian-swapping or can only // Block read - if your platform needs to do endian-swapping or can only
// handle aligned reads, do the conversion here // handle aligned reads, do the conversion here
FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i ) /*FORCE_INLINE*/ uint32_t getblock ( const uint32_t * p, int i )
{ {
return p[i]; return p[i];
} }
FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i ) /*FORCE_INLINE*/ uint64_t getblock ( const uint64_t * p, int i )
{ {
return p[i]; return p[i];
} }
@ -65,7 +65,7 @@ FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Finalization mix - force all bits of a hash block to avalanche // Finalization mix - force all bits of a hash block to avalanche
FORCE_INLINE uint32_t fmix ( uint32_t h ) /*FORCE_INLINE*/ uint32_t fmix ( uint32_t h )
{ {
h ^= h >> 16; h ^= h >> 16;
h *= 0x85ebca6b; h *= 0x85ebca6b;
@ -78,7 +78,7 @@ FORCE_INLINE uint32_t fmix ( uint32_t h )
//---------- //----------
FORCE_INLINE uint64_t fmix ( uint64_t k ) /*FORCE_INLINE*/ uint64_t fmix ( uint64_t k )
{ {
k ^= k >> 33; k ^= k >> 33;
k *= BIG_CONSTANT(0xff51afd7ed558ccd); k *= BIG_CONSTANT(0xff51afd7ed558ccd);