q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from iamthesenate1/GCC-11.x

Browse Source 
Fix compilation with GCC 11.X
This commit is contained in:
ptitSeb 2021-09-04 13:51:57 +02:00 committed by GitHub
commit 7fd3b651d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Engine/Base/CTString.cpp
View File

@ -291,7 +291,7 @@ ULONG CTString::GetHash(void) const
INDEX len = strlen(str_String); INDEX len = strlen(str_String);
for(INDEX i=0; i<len; i++) { for(INDEX i=0; i<len; i++) {
ulKey = _rotl(ulKey,4)+toupper(str_String[i]); ulKey = rotl(ulKey,4)+toupper(str_String[i]);
} }
return ulKey; return ulKey;
} }

2
Sources/Engine/Base/Types.h
View File

@ -232,7 +232,7 @@ MY_STATIC_ASSERT(size_tSize, sizeof(size_t) == sizeof(void*));
} }
} }
inline ULONG _rotl(ULONG ul, int bits) inline ULONG rotl(ULONG ul, int bits)
{ {
#if (defined __GNU_INLINE_X86_32__) #if (defined __GNU_INLINE_X86_32__)
// This, on the other hand, is wicked fast. :) // This, on the other hand, is wicked fast. :)