Merge branch 'master' into 'master'

fix order of ops



See merge request !8
This commit is contained in:
DarthArgus
2015-10-14 02:54:17 -04:00
2 changed files with 2 additions and 2 deletions
@@ -614,7 +614,7 @@ inline int UpperHashString(const char *string)
int h = 0;
while (*string != 0)
{
h = ((31 * h) + ((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string)) ^ (h >> 26);
h = ((31 * h) + (((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26)));
string++;
}
return(h);
@@ -155,7 +155,7 @@ inline int UpperHashString(char *string)
int h = 0;
while (*string != 0)
{
h = ((31 * h) + ((((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string)) ^ (h >> 26)));
h = ((31 * h) + (((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26)));
string++;
}
return(h);