--- deliantra/server/include/util.h	2006/09/12 19:20:08	1.10
+++ deliantra/server/include/util.h	2006/09/12 20:55:40	1.11
@@ -7,14 +7,98 @@
 # define is_constant(c) 0
 #endif
 
+#include <cstddef>
+
+#include <glib.h>
+
 // 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);
+  void *operator new (size_t s, void *p)
+  {
+    memset (p, 0, s);
+    return p;
+  }
+
+  void *operator new (size_t s)
+  {
+    return g_slice_alloc0 (s);
+  }
+
+  void *operator new[] (size_t s)
+  {
+    return g_slice_alloc0 (s);
+  }
+
+  void operator delete (void *p, size_t s)
+  {
+    g_slice_free1 (s, p);
+  }
+
+  void operator delete[] (void *p, size_t s)
+  {
+    g_slice_free1 (s, p);
+  }
+};
+
+void throw_bad_alloc () throw (std::bad_alloc);
+
+void *alloc (int s) throw (std::bad_alloc);
+void dealloc (void *p, int s) throw ();
+
+// a STL-compatible allocator that uses g_slice
+// boy, this is verbose
+template<typename Tp>
+struct slice_allocator
+{
+  typedef size_t size_type;
+  typedef ptrdiff_t difference_type;
+  typedef Tp *pointer;
+  typedef const Tp *const_pointer;
+  typedef Tp &reference;
+  typedef const Tp &const_reference;
+  typedef Tp value_type;
+
+  template <class U> 
+  struct rebind
+  {
+    typedef slice_allocator<U> other;
+  };
+
+  slice_allocator () throw () { }
+  slice_allocator (const slice_allocator &o) throw () { }
+  template<typename Tp2>
+  slice_allocator (const slice_allocator<Tp2> &) throw () { }
+
+  ~slice_allocator () { }
+
+  pointer address (reference x) const { return &x; }
+  const_pointer address (const_reference x) const { return &x; }
+
+  pointer allocate (size_type n, const_pointer = 0)
+  {
+    return static_cast<pointer>(alloc (n * sizeof (Tp)));
+  }
+
+  void deallocate (pointer p, size_type n)
+  {
+    dealloc (static_cast<void *>(p), n);
+  }
+
+  size_type max_size ()const throw ()
+  {
+    return size_t (-1) / sizeof (Tp);
+  }
+
+  void construct (pointer p, const Tp &val)
+  {
+    ::new (p) Tp (val);
+  }
+
+  void destroy (pointer p)
+  {
+    p->~Tp ();
+  }
 };
 
 struct refcounted
@@ -94,9 +178,9 @@
 #include <vector>
 
 template<class obj>
-struct unordered_vector : std::vector<obj>
+struct unordered_vector : std::vector<obj, slice_allocator<obj> >
 {
-  typedef typename std::vector<obj>::iterator iterator;
+  typedef typename unordered_vector::iterator iterator;
 
   void erase (unsigned int pos)
   {