From: Pawel Bylica Date: Tue, 19 May 2015 10:51:24 +0000 (+0000) Subject: Revert "Avoid size_t -> unsigned conversion in MathExtras.h header. NFC". X-Git-Tag: android-x86-7.1-r4~48032 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef3ec7c7831f08b863daa9a66422eca8d68804d5;p=android-x86%2Fexternal-llvm.git Revert "Avoid size_t -> unsigned conversion in MathExtras.h header. NFC". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237680 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h index ea3f7e09542..340dc934934 100644 --- a/include/llvm/Support/MathExtras.h +++ b/include/llvm/Support/MathExtras.h @@ -465,26 +465,26 @@ inline double Log2(double Value) { /// Log2_32 - This function returns the floor log base 2 of the specified value, /// -1 if the value is zero. (32 bit edition.) /// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2 -inline size_t Log2_32(uint32_t Value) { +inline unsigned Log2_32(uint32_t Value) { return 31 - countLeadingZeros(Value); } /// Log2_64 - This function returns the floor log base 2 of the specified value, /// -1 if the value is zero. (64 bit edition.) -inline size_t Log2_64(uint64_t Value) { +inline unsigned Log2_64(uint64_t Value) { return 63 - countLeadingZeros(Value); } /// Log2_32_Ceil - This function returns the ceil log base 2 of the specified /// value, 32 if the value is zero. (32 bit edition). /// Ex. Log2_32_Ceil(32) == 5, Log2_32_Ceil(1) == 0, Log2_32_Ceil(6) == 3 -inline size_t Log2_32_Ceil(uint32_t Value) { +inline unsigned Log2_32_Ceil(uint32_t Value) { return 32 - countLeadingZeros(Value - 1); } /// Log2_64_Ceil - This function returns the ceil log base 2 of the specified /// value, 64 if the value is zero. (64 bit edition.) -inline size_t Log2_64_Ceil(uint64_t Value) { +inline unsigned Log2_64_Ceil(uint64_t Value) { return 64 - countLeadingZeros(Value - 1); }