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

Comparing deliantra/server/include/util.h (file contents):
Revision 1.120 by root, Mon Oct 29 23:55:54 2012 UTC vs.
Revision 1.121 by root, Sun Nov 11 01:27:44 2012 UTC

   refcnt_buf (void *data, size_t size);
   refcnt_buf (const refcnt_buf &src)
   {
     data = src.data;
-    ++_refcnt ();
+    inc ();
   }
   ~refcnt_buf ();
   refcnt_buf &operator =(const refcnt_buf &src);
     return _size ();
   }
 protected:
   enum {
-    overhead = sizeof (unsigned int) * 2
+    overhead = sizeof (uint32_t) * 2
   };
-  unsigned int &_size () const
+  uint32_t &_size () const
   {
     return ((unsigned int *)data)[-2];
   }
-  unsigned int &_refcnt () const
+  uint32_t &_refcnt () const
   {
     return ((unsigned int *)data)[-1];
   }
-  void _alloc (unsigned int size)
+  void _alloc (uint32_t size)
   {
     data = ((char *)salloc<char> (size + overhead)) + overhead;
     _size   () = size;
     _refcnt () = 1;
   }
+  void _dealloc ();
+  void inc ()
+  {
+    ++_refcnt ();
+  }
   void dec ()
   {
     if (!--_refcnt ())
-      sfree<char> (data - overhead, size () + overhead);
+      _dealloc ();
   }
 };
 INTERFACE_CLASS (attachable)
 struct refcnt_base

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