ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.11 by root, Tue Sep 12 20:55:40 2006 UTC vs.
Revision 1.16 by root, Fri Nov 17 19:40:54 2006 UTC

… …
9 9
10#include <cstddef> 10#include <cstddef>
11 11
12#include <glib.h> 12#include <glib.h>
13 13
14// use a gcc extension for auto declarations until ISO C++ sanctifies them
15#define AUTODECL(var,expr) typeof(expr) var = (expr)
16
14// makes dynamically allocated objects zero-initialised 17// makes dynamically allocated objects zero-initialised
15struct zero_initialised 18struct zero_initialised
16{ 19{
17 void *operator new (size_t s, void *p) 20 void *operator new (size_t s, void *p)
18 { 21 {
… …
39 { 42 {
40 g_slice_free1 (s, p); 43 g_slice_free1 (s, p);
41 } 44 }
42}; 45};
43 46
44void throw_bad_alloc () throw (std::bad_alloc); 47// strictly the same as g_slice_alloc, but never returns 0
45
46void *alloc (int s) throw (std::bad_alloc); 48void *alloc (int s) throw (std::bad_alloc);
49// for symmetry
47void dealloc (void *p, int s) throw (); 50inline void dealloc (void *p, int s) throw ()
51{
52 g_slice_free1 (s, p);
53}
48 54
49// a STL-compatible allocator that uses g_slice 55// a STL-compatible allocator that uses g_slice
50// boy, this is verbose 56// boy, this is verbose
51template<typename Tp> 57template<typename Tp>
52struct slice_allocator 58struct slice_allocator
… …
80 return static_cast<pointer>(alloc (n * sizeof (Tp))); 86 return static_cast<pointer>(alloc (n * sizeof (Tp)));
81 } 87 }
82 88
83 void deallocate (pointer p, size_type n) 89 void deallocate (pointer p, size_type n)
84 { 90 {
85 dealloc (static_cast<void *>(p), n); 91 dealloc (static_cast<void *>(p), n * sizeof (Tp));
86 } 92 }
87 93
88 size_type max_size ()const throw () 94 size_type max_size ()const throw ()
89 { 95 {
90 return size_t (-1) / sizeof (Tp); 96 return size_t (-1) / sizeof (Tp);
… …
101 } 107 }
102}; 108};
103 109
104struct refcounted 110struct refcounted
105{ 111{
112 refcounted () : refcnt (0) { }
113// virtual ~refcounted ();
114 void refcnt_inc () { ++refcnt; }
115 void refcnt_dec () { --refcnt; }
116 bool dead () { return refcnt == 0; }
106 mutable int refcnt; 117 mutable int refcnt;
107 refcounted () : refcnt (0) { } 118#if 0
108 void refcnt_inc () { ++refcnt; } 119private:
109 void refcnt_dec () { --refcnt; 120 static refcounted *rc_first;
110 if (refcnt < 0)abort();}//D 121 refcounted *rc_next;
122#endif
111}; 123};
112 124
113template<class T> 125template<class T>
114struct refptr 126struct refptr
115{ 127{

Diff Legend

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