--- deliantra/server/include/util.h	2006/09/14 00:07:15	1.13
+++ deliantra/server/include/util.h	2006/12/16 03:08:26	1.17
@@ -11,6 +11,9 @@
 
 #include <glib.h>
 
+// use a gcc extension for auto declarations until ISO C++ sanctifies them
+#define AUTODECL(var,expr) typeof(expr) var = (expr)
+
 // makes dynamically allocated objects zero-initialised
 struct zero_initialised
 {
@@ -42,11 +45,13 @@
 };
 
 // strictly the same as g_slice_alloc, but never returns 0
-void *alloc (int s) throw (std::bad_alloc);
+void *salloc (int size)            throw (std::bad_alloc);
+// also copies src into the new area, like "memdup"
+void *salloc (int size, void *src) throw (std::bad_alloc);
 // for symmetry
-inline void dealloc (void *p, int s) throw ()
+inline void sfree (void *ptr, int size) throw ()
 {
-  g_slice_free1 (s, p);
+  g_slice_free1 (size, ptr);
 }
 
 // a STL-compatible allocator that uses g_slice
@@ -80,12 +85,12 @@
 
   pointer allocate (size_type n, const_pointer = 0)
   {
-    return static_cast<pointer>(alloc (n * sizeof (Tp)));
+    return static_cast<pointer>(salloc (n * sizeof (Tp)));
   }
 
   void deallocate (pointer p, size_type n)
   {
-    dealloc (static_cast<void *>(p), n * sizeof (Tp));
+    sfree (static_cast<void *>(p), n * sizeof (Tp));
   }
 
   size_type max_size ()const throw ()
@@ -106,11 +111,17 @@
 
 struct refcounted
 {
-  mutable int refcnt;
   refcounted () : refcnt (0) { }
+//  virtual ~refcounted ();
   void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt;
-  if (refcnt < 0)abort();}//D
+  void refcnt_dec () { --refcnt; }
+  bool dead () { return refcnt == 0; }
+  mutable int refcnt;
+#if 0
+private:
+  static refcounted *rc_first;
+  refcounted *rc_next;
+#endif
 };
 
 template<class T>
@@ -215,5 +226,10 @@
   assign ((char *)&dst, src, N);
 }
 
+typedef double tstamp;
+
+// return current time as timestampe
+tstamp now ();
+
 #endif