--- deliantra/server/include/util.h	2007/05/28 21:15:56	1.46
+++ deliantra/server/include/util.h	2007/06/04 13:04:00	1.49
@@ -35,6 +35,10 @@
 # define prefetch(addr,rw,locality)
 #endif
 
+#if __GNUC__ < 4 || (__GNUC__ == 4 || __GNUC_MINOR__ < 4)
+# define decltype(x) typeof(x)
+#endif
+
 // put into ifs if you are very sure that the expression
 // is mostly true or mosty false. note that these return
 // booleans, not the expression.
@@ -51,15 +55,15 @@
 #include <shstr.h>
 #include <traits.h>
 
-// use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define auto(var,expr) typeof(expr) var = (expr)
+// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
+#define auto(var,expr) decltype(expr) var = (expr)
 
 // very ugly macro that basicaly declares and initialises a variable
 // that is in scope for the next statement only
 // works only for stuff that can be assigned 0 and converts to false
 // (note: works great for pointers)
 // most ugly macro I ever wrote
-#define declvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
+#define statementvar(type, name, value) if (type name = 0) { } else if (((name) = (value)), 1)
 
 // in range including end
 #define IN_RANGE_INC(val,beg,end) \
@@ -403,6 +407,10 @@
   }
 };
 
+// Mostly the same as std::vector, but insert/erase can reorder
+// the elements, making insret/remove O(1) instead of O(n).
+//
+// NOTE: only some forms of erase/insert are available
 template<class T>
 struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
@@ -422,12 +430,37 @@
   }
 };
 
+// This container blends advantages of linked lists
+// (efficiency) with vectors (random access) by
+// by using an unordered vector and storing the vector
+// index inside the object.
+//
+// + memory-efficient on most 64 bit archs
+// + O(1) insert/remove
+// + free unique (but varying) id for inserted objects
+// + cache-friendly iteration
+// - only works for pointers to structs
+//
+// NOTE: only some forms of erase/insert are available
 template<class T, int T::* index>
 struct object_vector : std::vector<T *, slice_allocator<T *> >
 {
+  typedef typename object_vector::iterator iterator;
+
+  bool contains (const T *obj) const
+  {
+    return obj->*index;
+  }
+
+  iterator find (const T *obj)
+  {
+    return obj->*index
+      ? this->begin () + obj->*index - 1
+      : this->end ();
+  }
+
   void insert (T *obj)
   {
-    assert (!(obj->*index));
     push_back (obj);
     obj->*index = this->size ();
   }
@@ -439,7 +472,6 @@
 
   void erase (T *obj)
   {
-    assert (obj->*index);
     unsigned int pos = obj->*index;
     obj->*index = 0;