diff options
Diffstat (limited to 'boost/intrusive/detail/math.hpp')
| -rw-r--r-- | boost/intrusive/detail/math.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/boost/intrusive/detail/math.hpp b/boost/intrusive/detail/math.hpp index 03000fceeb..dfebe2ab42 100644 --- a/boost/intrusive/detail/math.hpp +++ b/boost/intrusive/detail/math.hpp @@ -127,7 +127,7 @@ namespace detail { { return (n >> 1) + ((n & 1u) & (n != 1)); } template<std::size_t N> - inline std::size_t floor_log2 (std::size_t x, integer<std::size_t, N>) + inline std::size_t floor_log2 (std::size_t x, integral_constant<std::size_t, N>) { const std::size_t Bits = N; const bool Size_t_Bits_Power_2= !(Bits & (Bits-1)); @@ -156,7 +156,7 @@ namespace detail { //http://stackoverflow.com/questions/11376288/fast-computing-of-log2-for-64-bit-integers //Thanks to Desmond Hume - inline std::size_t floor_log2 (std::size_t v, integer<std::size_t, 32>) + inline std::size_t floor_log2 (std::size_t v, integral_constant<std::size_t, 32>) { static const int MultiplyDeBruijnBitPosition[32] = { @@ -173,7 +173,7 @@ namespace detail { return MultiplyDeBruijnBitPosition[(std::size_t)(v * 0x07C4ACDDU) >> 27]; } - inline std::size_t floor_log2 (std::size_t v, integer<std::size_t, 64>) + inline std::size_t floor_log2 (std::size_t v, integral_constant<std::size_t, 64>) { static const std::size_t MultiplyDeBruijnBitPosition[64] = { 63, 0, 58, 1, 59, 47, 53, 2, @@ -198,7 +198,7 @@ namespace detail { inline std::size_t floor_log2 (std::size_t x) { const std::size_t Bits = sizeof(std::size_t)*CHAR_BIT; - return floor_log2(x, integer<std::size_t, Bits>()); + return floor_log2(x, integral_constant<std::size_t, Bits>()); } #endif |