summaryrefslogtreecommitdiff
path: root/src/third_party/murmurhash3
diff options
context:
space:
mode:
authorKevin Matulef <matulef@gmail.com>2012-02-14 12:48:40 -0500
committerKevin Matulef <matulef@gmail.com>2012-02-14 12:48:40 -0500
commit291be8e769616761080d51c7edf694851e373216 (patch)
tree13bc2849ff58f1affeefbe5b4658ad8891e5e335 /src/third_party/murmurhash3
parent6f15c1ac09f8d96d5683281783171bc5c8bea2f7 (diff)
downloadmongo-291be8e769616761080d51c7edf694851e373216.tar.gz
added inlines for compiling with older gcc
Diffstat (limited to 'src/third_party/murmurhash3')
-rw-r--r--src/third_party/murmurhash3/MurmurHash3.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/murmurhash3/MurmurHash3.cpp b/src/third_party/murmurhash3/MurmurHash3.cpp
index 0bf738662ba..421697842b6 100644
--- a/src/third_party/murmurhash3/MurmurHash3.cpp
+++ b/src/third_party/murmurhash3/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 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 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 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 inline uint64_t fmix ( uint64_t k )
{
k ^= k >> 33;
k *= BIG_CONSTANT(0xff51afd7ed558ccd);