Add beast_basics and remove unused modules from build

This commit is contained in:
Vinnie Falco
2013-06-17 09:31:21 -07:00
parent 5a28c54505
commit 6d961d87f8
6 changed files with 59 additions and 74 deletions

View File

@@ -29,8 +29,6 @@ namespace Murmur
#if BEAST_MSVC
#define FORCE_INLINE __forceinline
#define ROTL32(x,y) _rotl(x,y)
#define ROTL64(x,y) _rotl64(x,y)
@@ -40,8 +38,6 @@ namespace Murmur
#else
#define FORCE_INLINE __attribute__((always_inline))
static inline uint32_t rotl32 ( uint32_t x, int8_t r )
{
return (x << r) | (x >> (32 - r));
@@ -63,12 +59,12 @@ static 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
static FORCE_INLINE uint32_t getblock ( const uint32_t* p, int i )
static forcedinline uint32_t getblock ( const uint32_t* p, int i )
{
return p[i];
}
static FORCE_INLINE uint64_t getblock ( const uint64_t* p, int i )
static forcedinline uint64_t getblock ( const uint64_t* p, int i )
{
return p[i];
}
@@ -76,7 +72,7 @@ static FORCE_INLINE uint64_t getblock ( const uint64_t* p, int i )
//-----------------------------------------------------------------------------
// Finalization mix - force all bits of a hash block to avalanche
static FORCE_INLINE uint32_t fmix ( uint32_t h )
static forcedinline uint32_t fmix ( uint32_t h )
{
h ^= h >> 16;
h *= 0x85ebca6b;
@@ -89,7 +85,7 @@ static FORCE_INLINE uint32_t fmix ( uint32_t h )
//----------
static FORCE_INLINE uint64_t fmix ( uint64_t k )
static forcedinline uint64_t fmix ( uint64_t k )
{
k ^= k >> 33;
k *= BIG_CONSTANT (0xff51afd7ed558ccd);