summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanjent@gmail.com <tanjent@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a>2013-05-10 18:34:06 +0000
committertanjent@gmail.com <tanjent@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a>2013-05-10 18:34:06 +0000
commit6f63a4882e6b2cf87e8eec1a3ef8644e0d963283 (patch)
tree1ed37aaabc0b287307c068763ceaf4f0a16c250b
parent8adb1336422e3ad4d78ba54fb56692f2ed07124c (diff)
downloadsrc-6f63a4882e6b2cf87e8eec1a3ef8644e0d963283.tar.gz
Add required 'inline' keyword to FORCE_INLINE macros.
git-svn-id: http://smhasher.googlecode.com/svn/trunk@149 77a7d1d3-4c08-bdc2-d393-d5859734b01a
-rw-r--r--MurmurHash3.cpp2
-rw-r--r--Platform.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/MurmurHash3.cpp b/MurmurHash3.cpp
index 302e974..5a55b7a 100644
--- a/MurmurHash3.cpp
+++ b/MurmurHash3.cpp
@@ -29,7 +29,7 @@
#else // defined(_MSC_VER)
-#define FORCE_INLINE __attribute__((always_inline))
+#define FORCE_INLINE inline __attribute__((always_inline))
inline uint32_t rotl32 ( uint32_t x, int8_t r )
{
diff --git a/Platform.h b/Platform.h
index 8de26be..6d0f0df 100644
--- a/Platform.h
+++ b/Platform.h
@@ -40,7 +40,7 @@ void SetAffinity ( int cpu );
#include <stdint.h>
-#define FORCE_INLINE __attribute__((always_inline))
+#define FORCE_INLINE inline __attribute__((always_inline))
#define NEVER_INLINE __attribute__((noinline))
inline uint32_t rotl32 ( uint32_t x, int8_t r )