--- deliantra/server/include/util.h	2006/09/04 11:07:59	1.3
+++ deliantra/server/include/util.h	2006/09/11 01:16:20	1.6
@@ -10,11 +10,67 @@
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
+  void *operator new (size_t s, void *);
   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);
+  }
+};
+
+#include <vector>
+
+template<class obj>
+struct unordered_vector : std::vector<obj>
+{
+  typedef typename std::vector<obj>::iterator iterator;
+
+  void erase (unsigned int pos)
+  {
+    if (pos < this->size () - 1)
+      (*this)[pos] = (*this)[this->size () - 1];
+
+    this->pop_back ();
+  }
+
+  void erase (iterator i)
+  {
+    erase ((unsigned int )(i - this->begin ()));
+  }
+};
+
 #endif