Skip to content

Commit 214effd

Browse files
committed
CXX-277 Work around windows warning about repeated 'inline'
See http://reviews.llvm.org/D2025?id=5157
1 parent 1b62980 commit 214effd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/third_party/murmurhash3/MurmurHash3.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )
5252
// Block read - if your platform needs to do endian-swapping or can only
5353
// handle aligned reads, do the conversion here
5454

55-
FORCE_INLINE inline uint32_t getblock ( const uint32_t * p, int i )
55+
inline FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i )
5656
{
5757
return p[i];
5858
}
5959

60-
FORCE_INLINE inline uint64_t getblock ( const uint64_t * p, int i )
60+
inline FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
6161
{
6262
return p[i];
6363
}
6464

6565
//-----------------------------------------------------------------------------
6666
// Finalization mix - force all bits of a hash block to avalanche
6767

68-
FORCE_INLINE inline uint32_t fmix ( uint32_t h )
68+
inline FORCE_INLINE uint32_t fmix ( uint32_t h )
6969
{
7070
h ^= h >> 16;
7171
h *= 0x85ebca6b;
@@ -78,7 +78,7 @@ FORCE_INLINE inline uint32_t fmix ( uint32_t h )
7878

7979
//----------
8080

81-
FORCE_INLINE inline uint64_t fmix ( uint64_t k )
81+
inline FORCE_INLINE uint64_t fmix ( uint64_t k )
8282
{
8383
k ^= k >> 33;
8484
k *= BIG_CONSTANT(0xff51afd7ed558ccd);

0 commit comments

Comments
 (0)