summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/third_party/murmurhash
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/angle/src/third_party/murmurhash')
-rw-r--r--src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.cpp2
-rw-r--r--src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.cpp b/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.cpp
index dd86292649..a599c26502 100644
--- a/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.cpp
+++ b/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.cpp
@@ -29,6 +29,8 @@
#else // defined(_MSC_VER)
+// Ignore GCC force inline warnings
+#pragma GCC diagnostic ignored "-Wattributes"
#define FORCE_INLINE __attribute__((always_inline))
inline uint32_t rotl32 ( uint32_t x, int8_t r )
diff --git a/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.h b/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.h
index adb52004e2..bb02cd508f 100644
--- a/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.h
+++ b/src/3rdparty/angle/src/third_party/murmurhash/MurmurHash3.h
@@ -20,4 +20,4 @@ void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out
//-----------------------------------------------------------------------------
-#endif // _MURMURHASH3_H_ \ No newline at end of file
+#endif // _MURMURHASH3_H_