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

Comparing deliantra/server/include/util.h (file contents):
Revision 1.16 by root, Fri Nov 17 19:40:54 2006 UTC vs.
Revision 1.17 by root, Sat Dec 16 03:08:26 2006 UTC

     g_slice_free1 (s, p);
   }
 };
 // 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
 // boy, this is verbose
 template<typename Tp>
   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)));
+    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 ()
   {
     return size_t (-1) / sizeof (Tp);
 inline void assign (char (&dst)[N], const char *src)
 {
   assign ((char *)&dst, src, N);
 }
+typedef double tstamp;
+// return current time as timestampe
+tstamp now ();
 #endif

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