--- deliantra/server/include/util.h	2007/05/28 21:15:56	1.46
+++ deliantra/server/include/util.h	2007/06/04 12:19:08	1.48
@@ -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.
@@ -52,14 +56,14 @@
 #include <traits.h>
 
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
-#define auto(var,expr) typeof(expr) var = (expr)
+#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) \
@@ -425,6 +429,20 @@
 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));