From c113674a897272bc4b5c91b23c0b77c5eb31e7dd Mon Sep 17 00:00:00 2001 From: Davi Reis Date: Mon, 26 Aug 2013 23:32:04 -0300 Subject: [PATCH] Dropped inline from Murmur for gcc 4.8 compatibility. --- cxxmph/MurmurHash3.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cxxmph/MurmurHash3.cpp b/cxxmph/MurmurHash3.cpp index 09ffb26..dff0eaa 100644 --- a/cxxmph/MurmurHash3.cpp +++ b/cxxmph/MurmurHash3.cpp @@ -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 // 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]; } -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]; } @@ -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 -FORCE_INLINE uint32_t fmix ( uint32_t h ) +/*FORCE_INLINE*/ uint32_t fmix ( uint32_t h ) { h ^= h >> 16; 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 *= BIG_CONSTANT(0xff51afd7ed558ccd);