From 995ccf816886cc0fdcfcde073581f44159e21b34 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 16 Mar 2018 06:03:29 +1100 Subject: BLI_assert: extract from BLI_utildefines BLI_utildefines is quite large, defining many unrelated things. Add BLI_assert to include in inline headers, so math defines don't pull in too much. --- source/blender/blenlib/intern/math_bits_inline.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source/blender/blenlib/intern/math_bits_inline.c') diff --git a/source/blender/blenlib/intern/math_bits_inline.c b/source/blender/blenlib/intern/math_bits_inline.c index 933ded55d53..9b16756134e 100644 --- a/source/blender/blenlib/intern/math_bits_inline.c +++ b/source/blender/blenlib/intern/math_bits_inline.c @@ -33,10 +33,8 @@ MINLINE int bitscan_forward_i(int a) { -#if 0 /* No BLI_assert in INLINE :/ */ BLI_assert(a != 0); -#endif -# ifdef _MSC_VER +#ifdef _MSC_VER unsigned long ctz; _BitScanForward(&ctz, a); return ctz; @@ -64,10 +62,8 @@ MINLINE unsigned int bitscan_forward_clear_uint(unsigned int *a) MINLINE int bitscan_reverse_i(int a) { -#if 0 /* No BLI_assert in INLINE :/ */ BLI_assert(a != 0); -#endif -# ifdef _MSC_VER +#ifdef _MSC_VER unsigned long clz; _BitScanReverse(&clz, a); return clz; -- cgit v1.2.3