[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.4 by root, Mon Sep 4 17:16:19 2006 UTC vs.
Revision 1.6 by root, Mon Sep 11 01:16:20 2006 UTC

 #endif
 // 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;
-    unsigned int i = 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
   {
     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

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines