… | |
… | |
61 | { |
61 | { |
62 | void *operator new (size_t s); |
62 | void *operator new (size_t s); |
63 | void operator delete (void *p, size_t s); |
63 | void operator delete (void *p, size_t s); |
64 | }; |
64 | }; |
65 | |
65 | |
|
|
66 | // alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6) |
|
|
67 | void *operator new (size_t s) throw (std::bad_alloc); |
|
|
68 | void operator delete (void *p) throw (); |
|
|
69 | |
66 | struct stringvec : simplevec<char *> |
70 | struct stringvec : simplevec<char *> |
67 | { |
71 | { |
68 | ~stringvec () |
72 | ~stringvec () |
69 | { |
73 | { |
70 | for (char **c = begin (); c != end (); c++) |
74 | for (char **c = begin (); c != end (); c++) |
… | |
… | |
87 | T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } |
91 | T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } |
88 | const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); } |
92 | const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); } |
89 | }; |
93 | }; |
90 | #endif |
94 | #endif |
91 | |
95 | |
92 | inline void * |
96 | typedef estl::scoped_array<char> auto_str; |
93 | operator new (size_t size) throw (std::bad_alloc) |
|
|
94 | { |
|
|
95 | // TODO: use rxvt_malloc |
|
|
96 | return malloc (size); |
|
|
97 | } |
|
|
98 | |
|
|
99 | inline void |
|
|
100 | operator delete (void *p) throw () |
|
|
101 | { |
|
|
102 | free (p); |
|
|
103 | } |
|
|
104 | |
|
|
105 | template<typename T> |
|
|
106 | struct auto_ptr |
|
|
107 | { |
|
|
108 | T *p; |
|
|
109 | |
|
|
110 | auto_ptr () : p (0) { } |
|
|
111 | |
|
|
112 | explicit |
|
|
113 | auto_ptr (T *a) : p (a) { } |
|
|
114 | |
|
|
115 | auto_ptr (auto_ptr &a) |
|
|
116 | { |
|
|
117 | p = a.p; |
|
|
118 | a.p = 0; |
|
|
119 | } |
|
|
120 | |
|
|
121 | template<typename A> |
|
|
122 | auto_ptr (auto_ptr<A> &a) |
|
|
123 | { |
|
|
124 | p = a.p; |
|
|
125 | a.p = 0; |
|
|
126 | } |
|
|
127 | |
|
|
128 | ~auto_ptr () |
|
|
129 | { |
|
|
130 | delete p; |
|
|
131 | } |
|
|
132 | |
|
|
133 | void reset (T *a) |
|
|
134 | { |
|
|
135 | delete p; |
|
|
136 | p = a; |
|
|
137 | } |
|
|
138 | |
|
|
139 | // void because it makes sense in our context |
|
|
140 | void operator =(auto_ptr &a) |
|
|
141 | { |
|
|
142 | reset (a.release ()); |
|
|
143 | } |
|
|
144 | |
|
|
145 | template<typename A> |
|
|
146 | void operator =(auto_ptr<A> &a) |
|
|
147 | { |
|
|
148 | reset (a.release ()); |
|
|
149 | } |
|
|
150 | |
|
|
151 | T *operator ->() const { return p; } |
|
|
152 | T &operator *() const { return *p; } |
|
|
153 | |
|
|
154 | operator T *() { return p; } |
|
|
155 | T *get () const { return p; } |
|
|
156 | |
|
|
157 | T *release() |
|
|
158 | { |
|
|
159 | T *r = p; |
|
|
160 | p = 0; |
|
|
161 | return r; |
|
|
162 | } |
|
|
163 | }; |
|
|
164 | |
|
|
165 | typedef auto_ptr<char> auto_str; |
|
|
166 | |
97 | |
167 | #endif |
98 | #endif |
168 | |
99 | |