--- deliantra/server/include/util.h	2006/09/02 22:57:55	1.1
+++ deliantra/server/include/util.h	2006/09/07 20:03:20	1.5
@@ -1,11 +1,53 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+#if __GNUC__ >= 3
+# define is_constant(c) __builtin_constant_p (c)
+#else
+# define is_constant(c) 0
+#endif
+
 // makes dynamically allocated objects zero-initialised
 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