diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:10:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-13 21:11:20 +0300 |
| commit | b09563ca8c42f46233bd104e30812e4fc7322ba3 (patch) | |
| tree | 49d304ba915aac88b69ab367f98eb71af36f2662 /source/blender/blenlib | |
| parent | ef80914c99fb94a4bc7e02a1f808eb0162577fec (diff) | |
Cleanup: fixes for building with recent clang
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_bitmap.h | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_ghash.h | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_bitmap.h b/source/blender/blenlib/BLI_bitmap.h index e9a828c678c..60fc143a447 100644 --- a/source/blender/blenlib/BLI_bitmap.h +++ b/source/blender/blenlib/BLI_bitmap.h @@ -66,23 +66,23 @@ typedef unsigned int BLI_bitmap; /* get the value of a single bit at '_index' */ #define BLI_BITMAP_TEST(_bitmap, _index) \ - (CHECK_TYPE_INLINE(_bitmap, BLI_bitmap *), \ + (CHECK_TYPE_ANY(_bitmap, BLI_bitmap *, const BLI_bitmap *), \ ((_bitmap)[(_index) >> _BITMAP_POWER] & \ (1u << ((_index) & _BITMAP_MASK)))) #define BLI_BITMAP_TEST_BOOL(_bitmap, _index) \ - (CHECK_TYPE_INLINE(_bitmap, BLI_bitmap *), \ + (CHECK_TYPE_ANY(_bitmap, BLI_bitmap *, const BLI_bitmap *), \ (BLI_BITMAP_TEST(_bitmap, _index) != 0)) /* set the value of a single bit at '_index' */ #define BLI_BITMAP_ENABLE(_bitmap, _index) \ - (CHECK_TYPE_INLINE(_bitmap, BLI_bitmap *), \ + (CHECK_TYPE_ANY(_bitmap, BLI_bitmap *, const BLI_bitmap *), \ ((_bitmap)[(_index) >> _BITMAP_POWER] |= \ (1u << ((_index) & _BITMAP_MASK)))) /* clear the value of a single bit at '_index' */ #define BLI_BITMAP_DISABLE(_bitmap, _index) \ - (CHECK_TYPE_INLINE(_bitmap, BLI_bitmap *), \ + (CHECK_TYPE_ANY(_bitmap, BLI_bitmap *, const BLI_bitmap *), \ ((_bitmap)[(_index) >> _BITMAP_POWER] &= \ ~(1u << ((_index) & _BITMAP_MASK)))) diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index e9f83e786de..bf2b4126453 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -124,17 +124,17 @@ bool BLI_ghashutil_ptrcmp(const void *a, const void *b); unsigned int BLI_ghashutil_strhash_n(const char *key, size_t n); #define BLI_ghashutil_strhash(key) ( \ - CHECK_TYPE_INLINE(key, char *), \ + CHECK_TYPE_ANY(key, char *, const char *, const char * const), \ BLI_ghashutil_strhash_p(key)) unsigned int BLI_ghashutil_strhash_p(const void *key); bool BLI_ghashutil_strcmp(const void *a, const void *b); #define BLI_ghashutil_inthash(key) ( \ - CHECK_TYPE_INLINE(&(key), int *), \ + CHECK_TYPE_ANY(&(key), int *, const int *), \ BLI_ghashutil_uinthash((unsigned int)key)) unsigned int BLI_ghashutil_uinthash(unsigned int key); #define BLI_ghashutil_inthash_v4(key) ( \ - CHECK_TYPE_INLINE(key, int *), \ + CHECK_TYPE_ANY(key, int *, const int *), \ BLI_ghashutil_uinthash_v4((const unsigned int *)key)) unsigned int BLI_ghashutil_uinthash_v4(const unsigned int key[4]); #define BLI_ghashutil_inthash_v4_p \ diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 470219b2042..b1b225096a7 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -436,8 +436,8 @@ extern "C" { /* assuming a static array */ #if defined(__GNUC__) && !defined(__cplusplus) -# define ARRAY_SIZE(arr) \ - ((sizeof(struct {int isnt_array : ((void *)&(arr) == &(arr)[0]);}) * 0) + \ +# define ARRAY_SIZE(arr) \ + ((sizeof(struct {int isnt_array : ((const void *)&(arr) == &(arr)[0]);}) * 0) + \ (sizeof(arr) / sizeof(*(arr)))) #else # define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*(arr))) |