[Bf-blender-cvs] [2aa0f8a41bb] master: Math utils: Cleanup, use _uint suffix for function which operates on uint
Sergey Sharybin
noreply at git.blender.org
Fri Dec 15 16:59:13 CET 2017
Commit: 2aa0f8a41bba64933db19ad4231f9392a8445cd7
Author: Sergey Sharybin
Date: Fri Dec 15 16:16:22 2017 +0100
Branches: master
https://developer.blender.org/rB2aa0f8a41bba64933db19ad4231f9392a8445cd7
Math utils: Cleanup, use _uint suffix for function which operates on uint
===================================================================
M source/blender/blenlib/BLI_math_bits.h
M source/blender/blenlib/intern/math_bits_inline.c
===================================================================
diff --git a/source/blender/blenlib/BLI_math_bits.h b/source/blender/blenlib/BLI_math_bits.h
index 1ac98a682d1..1d0ee77feed 100644
--- a/source/blender/blenlib/BLI_math_bits.h
+++ b/source/blender/blenlib/BLI_math_bits.h
@@ -31,7 +31,7 @@ extern "C" {
#include "BLI_math_inline.h"
-MINLINE unsigned int highest_order_bit_i(unsigned int n);
+MINLINE unsigned int highest_order_bit_uint(unsigned int n);
MINLINE unsigned short highest_order_bit_s(unsigned short n);
#ifdef __GNUC__
diff --git a/source/blender/blenlib/intern/math_bits_inline.c b/source/blender/blenlib/intern/math_bits_inline.c
index 82d7e2114c2..9f502d367cb 100644
--- a/source/blender/blenlib/intern/math_bits_inline.c
+++ b/source/blender/blenlib/intern/math_bits_inline.c
@@ -27,7 +27,7 @@
#include "BLI_math_bits.h"
-MINLINE unsigned int highest_order_bit_i(unsigned int n)
+MINLINE unsigned int highest_order_bit_uint(unsigned int n)
{
n |= (n >> 1);
n |= (n >> 2);
More information about the Bf-blender-cvs
mailing list