--- deliantra/server/include/util.h 2006/09/03 23:33:01 1.2 +++ deliantra/server/include/util.h 2006/09/07 20:03:20 1.5 @@ -11,7 +11,43 @@ struct zero_initialised { void *operator new (size_t s); + void *operator new [] (size_t s); void operator delete (void *p, size_t s); + void operator delete [] (void *p, size_t s); +}; + +struct str_hash +{ + std::size_t operator ()(const char *s) const + { + unsigned long hash = 0; + + /* use the one-at-a-time hash function, which supposedly is + * better than the djb2-like one used by perl5.005, but + * certainly is better then the bug used here before. + * see http://burtleburtle.net/bob/hash/doobs.html + */ + while (*s) + { + hash += *s++; + hash += hash << 10; + hash ^= hash >> 6; + } + + hash += hash << 3; + hash ^= hash >> 11; + hash += hash << 15; + + return hash; + } +}; + +struct str_equal +{ + bool operator ()(const char *a, const char *b) const + { + return !strcmp (a, b); + } }; #endif