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.19 by root, Sun Dec 17 19:07:23 2006 UTC vs.
Revision 1.20 by root, Sun Dec 17 23:10:35 2006 UTC

… …
42 { 42 {
43 g_slice_free1 (s, p); 43 g_slice_free1 (s, p);
44 } 44 }
45}; 45};
46 46
47void *salloc_ (int n) throw (std::bad_alloc);
48void *salloc_ (int n, void *src) throw (std::bad_alloc);
49
47// strictly the same as g_slice_alloc, but never returns 0 50// strictly the same as g_slice_alloc, but never returns 0
48void *salloc (int size) throw (std::bad_alloc); 51template<typename T>
52inline T *salloc (int n = 1) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T)); }
53
49// also copies src into the new area, like "memdup" 54// also copies src into the new area, like "memdup"
50// if src is 0, clears the memory 55// if src is 0, clears the memory
51void *salloc (int size, void *src) throw (std::bad_alloc);
52
53// and as a template
54template<typename T> 56template<typename T>
55inline T *salloc (int size) throw (std::bad_alloc) { return (T *)salloc (size * sizeof (T)); }
56template<typename T>
57inline T *salloc (int size, T *src) throw (std::bad_alloc) { return (T *)salloc (size * sizeof (T), (void *)src); } 57inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
58 58
59// for symmetry 59// for symmetry
60template<typename T> 60template<typename T>
61inline void sfree (T *ptr, int size) throw () 61inline void sfree (T *ptr, int n = 1) throw ()
62{ 62{
63 g_slice_free1 (size * sizeof (T), (void *)ptr); 63 g_slice_free1 (n * sizeof (T), (void *)ptr);
64} 64}
65 65
66// a STL-compatible allocator that uses g_slice 66// a STL-compatible allocator that uses g_slice
67// boy, this is verbose 67// boy, this is verbose
68template<typename Tp> 68template<typename Tp>

Diff Legend

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