diff options
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 14 | ||||
-rw-r--r-- | source/blender/blenlib/intern/BLI_ghash_utils.c | 19 |
2 files changed, 0 insertions, 33 deletions
diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index 141c631381b..31a9658bd7e 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -371,20 +371,6 @@ unsigned int BLI_ghashutil_uinthash_v4_murmur(const unsigned int key[4]); bool BLI_ghashutil_uinthash_v4_cmp(const void *a, const void *b); #define BLI_ghashutil_inthash_v4_cmp BLI_ghashutil_uinthash_v4_cmp -unsigned int BLI_ghashutil_uinthash_v2(const unsigned int key[2]); -#define BLI_ghashutil_inthash_v2(key) \ - (CHECK_TYPE_ANY(key, int *, const int *), BLI_ghashutil_uinthash_v2((const unsigned int *)key)) -#define BLI_ghashutil_inthash_v2_p ((GSetHashFP)BLI_ghashutil_uinthash_v2) -#define BLI_ghashutil_uinthash_v2_p ((GSetHashFP)BLI_ghashutil_uinthash_v2) -unsigned int BLI_ghashutil_uinthash_v2_murmur(const unsigned int key[2]); -#define BLI_ghashutil_inthash_v2_murmur(key) \ - (CHECK_TYPE_ANY(key, int *, const int *), \ - BLI_ghashutil_uinthash_v2_murmur((const unsigned int *)key)) -#define BLI_ghashutil_inthash_v2_p_murmur ((GSetHashFP)BLI_ghashutil_uinthash_v2_murmur) -#define BLI_ghashutil_uinthash_v2_p_murmur ((GSetHashFP)BLI_ghashutil_uinthash_v2_murmur) -bool BLI_ghashutil_uinthash_v2_cmp(const void *a, const void *b); -#define BLI_ghashutil_inthash_v2_cmp BLI_ghashutil_uinthash_v2_cmp - typedef struct GHashPair { const void *first; const void *second; diff --git a/source/blender/blenlib/intern/BLI_ghash_utils.c b/source/blender/blenlib/intern/BLI_ghash_utils.c index 83bf0373ae7..d6a4b24682f 100644 --- a/source/blender/blenlib/intern/BLI_ghash_utils.c +++ b/source/blender/blenlib/intern/BLI_ghash_utils.c @@ -86,25 +86,6 @@ bool BLI_ghashutil_uinthash_v4_cmp(const void *a, const void *b) return (memcmp(a, b, sizeof(uint[4])) != 0); } -uint BLI_ghashutil_uinthash_v2(const uint key[2]) -{ - uint hash; - hash = key[0]; - hash *= 37; - hash += key[1]; - return hash; -} - -uint BLI_ghashutil_uinthash_v2_murmur(const uint key[2]) -{ - return BLI_hash_mm2((const unsigned char *)key, sizeof(int) * 2 /* sizeof(key) */, 0); -} - -bool BLI_ghashutil_uinthash_v2_cmp(const void *a, const void *b) -{ - return (memcmp(a, b, sizeof(uint[2])) != 0); -} - uint BLI_ghashutil_uinthash(uint key) { key += ~(key << 16); |