aboutsummaryrefslogtreecommitdiff
path: root/mp/src/tier1/generichash.cpp
diff options
context:
space:
mode:
authorMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
committerMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
commit55ed12f8d1eb6887d348be03aee5573d44177ffb (patch)
tree3686f7ca78c780cd9a3d367b79a9d9250c1be7c0 /mp/src/tier1/generichash.cpp
parent* Added support for Visual C++ 2013 Express to VPC (diff)
downloadsource-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.tar.xz
source-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.zip
Updated the SDK with the latest code from the TF and HL2 branches.
Diffstat (limited to 'mp/src/tier1/generichash.cpp')
-rw-r--r--mp/src/tier1/generichash.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/mp/src/tier1/generichash.cpp b/mp/src/tier1/generichash.cpp
index a3a4a8a5..c5d3d38e 100644
--- a/mp/src/tier1/generichash.cpp
+++ b/mp/src/tier1/generichash.cpp
@@ -142,12 +142,12 @@ unsigned FASTCALL HashStringCaselessConventional( const char *pszKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL HashInt( const int n )
{
- register unsigned even, odd;
+ unsigned even, odd;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -159,16 +159,16 @@ unsigned FASTCALL HashInt( const int n )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash4( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -181,16 +181,16 @@ unsigned FASTCALL Hash4( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash8( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -209,16 +209,16 @@ unsigned FASTCALL Hash8( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash12( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];
@@ -243,16 +243,16 @@ unsigned FASTCALL Hash12( const void *pKey )
//-----------------------------------------------------------------------------
unsigned FASTCALL Hash16( const void *pKey )
{
- register const uint32 * p = (const uint32 *) pKey;
- register unsigned even,
- odd,
- n;
+ const uint32 * p = (const uint32 *) pKey;
+ unsigned even,
+ odd,
+ n;
n = *p;
even = g_nRandomValues[n & 0xff];
odd = g_nRandomValues[((n >> 8) & 0xff)];
even = g_nRandomValues[odd ^ (n >> 24)];
- odd = g_nRandomValues[even ^ (n >> 16) & 0xff];
+ odd = g_nRandomValues[even ^ ((n >> 16) & 0xff)];
even = g_nRandomValues[odd ^ ((n >> 8) & 0xff)];
odd = g_nRandomValues[even ^ (n & 0xff)];