summaryrefslogtreecommitdiff
path: root/include/my_bit.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-03-11 20:12:15 +0000
committerSergei Petrunia <psergey@askmonty.org>2017-03-11 20:12:15 +0000
commit5b30c7896e8514b29dba0909272cda49910243ae (patch)
tree9f4213363cb529795ae15fdb00b3e4f6ecd72ed5 /include/my_bit.h
parent5c1c2f67ec9373f55f9b69bdaf4adad416e4788b (diff)
parenteded6243bc4796ab44e70403edd059d32225f589 (diff)
downloadmariadb-git-5b30c7896e8514b29dba0909272cda49910243ae.tar.gz
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks
Diffstat (limited to 'include/my_bit.h')
-rw-r--r--include/my_bit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_bit.h b/include/my_bit.h
index 218829ba747..01cad95792c 100644
--- a/include/my_bit.h
+++ b/include/my_bit.h
@@ -1,5 +1,5 @@
/* Copyright (c) 2007, 2011, Oracle and/or its affiliates.
- Copyright (c) 2009-2011, Monty Program Ab
+ Copyright (c) 2009, 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ static inline uint32 my_clear_highest_bit(uint32 v)
static inline uint32 my_reverse_bits(uint32 key)
{
- return
+ 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) |