summaryrefslogtreecommitdiff
path: root/include/my_bit.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-06 08:41:48 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-06 08:41:48 +0200
commit32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76 (patch)
tree098d64b7c988bab8cca25b0f716d92f6f7e72ed9 /include/my_bit.h
parentaf9649c722810eb1754953eb406a84ec876ce693 (diff)
parentbae21bfb5de17328c33c3da8d191c6d3af14ae02 (diff)
downloadmariadb-git-32062cc61cd00e4cd3b7939c8a09f9c3ac34ec76.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'include/my_bit.h')
-rw-r--r--include/my_bit.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/my_bit.h b/include/my_bit.h
index 01cad95792c..1f97e80143a 100644
--- a/include/my_bit.h
+++ b/include/my_bit.h
@@ -108,11 +108,11 @@ static inline uint32 my_clear_highest_bit(uint32 v)
static inline uint32 my_reverse_bits(uint32 key)
{
- return (uint32)
- (_my_bits_reverse_table[ key & 255] << 24) |
- (_my_bits_reverse_table[(key>> 8) & 255] << 16) |
- (_my_bits_reverse_table[(key>>16) & 255] << 8) |
- _my_bits_reverse_table[(key>>24) ];
+ return
+ ((uint32)_my_bits_reverse_table[ key & 255] << 24) |
+ ((uint32)_my_bits_reverse_table[(key>> 8) & 255] << 16) |
+ ((uint32)_my_bits_reverse_table[(key>>16) & 255] << 8) |
+ (uint32)_my_bits_reverse_table[(key>>24) ];
}
/*