OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Minor changes to hash and hash_i to avoid making a copy of the string data

Browse Source
This commit is contained in:
Michael Hansen
2014-01-16 18:25:10 -08:00
parent 9e0330feea
commit 387e23061a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Plasma/CoreLib/plString.h
View File

@ -48,6 +48,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <cstring> #include <cstring>
#include <cstdarg> #include <cstdarg>
#include <cstdint> #include <cstdint>
#include <cctype>
#include <vector> #include <vector>
/** Single Unicode character code unit */ /** Single Unicode character code unit */
@ -603,11 +604,13 @@ public:
*/ */
struct hash struct hash
{ {
// TODO: This doesn't really use enough bits to be useful when
// size_t is 64-bits.
size_t operator()(const plString& str) const size_t operator()(const plString& str) const
{ {
uint32_t hash = 0; size_t hash = 0;
for (size_t i = 0; i < str.GetSize(); ++i) { for (size_t i = 0; i < str.GetSize(); ++i) {
hash += str.CharAt(i); hash += fetch_char(str, i);
hash += (hash << 10); hash += (hash << 10);
hash ^= (hash >> 6); hash ^= (hash >> 6);
} }
@ -616,15 +619,20 @@ public:
hash += (hash << 15); hash += (hash << 15);
return hash; return hash;
} }
protected:
virtual char fetch_char(const plString& str, size_t index) const
{ return str.CharAt(index); }
}; };
/** Functor that hashes a string for unordered containers. /** Functor that hashes a string for unordered containers.
* \remarks This returns the hash of the lower-case variant of the string. * \remarks This returns the hash of the lower-case variant of the string.
*/ */
struct hash_i : hash struct hash_i : public hash
{ {
size_t operator()(const plString& str) const protected:
{ return hash::operator()(str.ToLower()); } virtual char fetch_char(const plString& str, size_t index) const
{ return tolower(str.CharAt(index)); }
}; };
/** Functor which compares two strings case-insensitively for sorting. */ /** Functor which compares two strings case-insensitively for sorting. */