Skip to content

A
angle
Commit 8b2142e3 by Kai Ninomiya Committed by Commit Bot
Options

Put MurmurHash3 functions in the angle namespace

To prevent collisions when linking with other copies of MurmurHash3. BUG=697758 Change-Id: Id8a5c709ba972812ffa3ca143e7553cbf05fc57a Reviewed-on: https://chromium-review.googlesource.com/671194 Commit-Queue: Kai Ninomiya <kainino@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 10ce2d28
Showing with 6 additions and 0 deletions
src/common/third_party/murmurhash/MurmurHash3.cpp
...@@ -91,6 +91,8 @@ FORCE_INLINE uint64_t fmix64 ( uint64_t k ) ...@@ -91,6 +91,8 @@ FORCE_INLINE uint64_t fmix64 ( uint64_t k )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
namespace angle
{
void MurmurHash3_x86_32 ( const void * key, int len, void MurmurHash3_x86_32 ( const void * key, int len,
uint32_t seed, void * out ) uint32_t seed, void * out )
{ {
...@@ -330,6 +332,7 @@ void MurmurHash3_x64_128 ( const void * key, const int len, ...@@ -330,6 +332,7 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
((uint64_t*)out)[0] = h1; ((uint64_t*)out)[0] = h1;
((uint64_t*)out)[1] = h2; ((uint64_t*)out)[1] = h2;
} }
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
src/common/third_party/murmurhash/MurmurHash3.h
...@@ -26,11 +26,14 @@ typedef unsigned __int64 uint64_t; ...@@ -26,11 +26,14 @@ typedef unsigned __int64 uint64_t;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
namespace angle
{
void MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed, void * out ); void MurmurHash3_x86_32 ( const void * key, int len, uint32_t seed, void * out );
void MurmurHash3_x86_128 ( const void * key, int len, uint32_t seed, void * out ); void MurmurHash3_x86_128 ( const void * key, int len, uint32_t seed, void * out );
void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out ); void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment