Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 735704 - RotateLeft32 conflicts with winnt.h macro r=Waldo

Browse Source
This commit is contained in:
Jacek Caban 2012-03-15 13:43:28 +01:00
parent 9b626bf890
commit d54cd7b4d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mfbt/HashFunctions.h
View File

@ -58,7 +58,7 @@ namespace mozilla {
static const uint32_t GoldenRatioU32 = 0x9E3779B9U;
inline uint32_t
RotateLeft32(uint32_t value, uint8_t bits)
RotateBitsLeft32(uint32_t value, uint8_t bits)
{
MOZ_ASSERT(bits < 32);
return (value << bits) | (value >> (32 - bits));
@ -90,7 +90,7 @@ AddU32ToHash(uint32_t hash, uint32_t value)
* Otherwise, if |hash| is 0 (as it often is for the beginning of a message),
* the expression
*
* (GoldenRatioU32 * RotateLeft(hash, 5)) |xor| value
* (GoldenRatioU32 * RotateBitsLeft(hash, 5)) |xor| value
*
* evaluates to |value|.
*
@ -108,7 +108,7 @@ AddU32ToHash(uint32_t hash, uint32_t value)
* multiplicative effect. Our golden ratio constant has order 2^29, which is
* more than enough for our purposes.)
*/
return GoldenRatioU32 * (RotateLeft32(hash, 5) ^ value);
return GoldenRatioU32 * (RotateBitsLeft32(hash, 5) ^ value);
}
/**