| … | |
… | |
| 4 | #include <new> |
4 | #include <new> |
| 5 | #include <stdlib.h> |
5 | #include <stdlib.h> |
| 6 | #include <string.h> |
6 | #include <string.h> |
| 7 | #include "ecb.h" |
7 | #include "ecb.h" |
| 8 | #include "estl.h" |
8 | #include "estl.h" |
|
|
9 | |
|
|
10 | #include "emman.h" |
| 9 | |
11 | |
| 10 | // increases code size unless -fno-enforce-eh-specs |
12 | // increases code size unless -fno-enforce-eh-specs |
| 11 | #if __GNUC__ |
13 | #if __GNUC__ |
| 12 | # define NOTHROW |
14 | # define NOTHROW |
| 13 | # define THROW(x) |
15 | # define THROW(x) |
| … | |
… | |
| 59 | { |
61 | { |
| 60 | void *operator new (size_t s); |
62 | void *operator new (size_t s); |
| 61 | void operator delete (void *p, size_t s); |
63 | void operator delete (void *p, size_t s); |
| 62 | }; |
64 | }; |
| 63 | |
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 | |
| 64 | struct stringvec : simplevec<char *> |
70 | struct stringvec : simplevec<char *> |
| 65 | { |
71 | { |
| 66 | ~stringvec () |
72 | ~stringvec () |
| 67 | { |
73 | { |
| 68 | for (char **c = begin (); c != end (); c++) |
74 | for (char **c = begin (); c != end (); c++) |
| … | |
… | |
| 85 | T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } |
91 | T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } |
| 86 | 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])); } |
| 87 | }; |
93 | }; |
| 88 | #endif |
94 | #endif |
| 89 | |
95 | |
| 90 | inline void * |
96 | typedef estl::scoped_array<char> auto_str; |
| 91 | operator new (size_t size) |
|
|
| 92 | { |
|
|
| 93 | // TODO: use rxvt_malloc |
|
|
| 94 | return malloc (size); |
|
|
| 95 | } |
|
|
| 96 | |
|
|
| 97 | inline void |
|
|
| 98 | operator delete (void *p) |
|
|
| 99 | { |
|
|
| 100 | free (p); |
|
|
| 101 | } |
|
|
| 102 | |
|
|
| 103 | template<typename T> |
|
|
| 104 | struct auto_ptr |
|
|
| 105 | { |
|
|
| 106 | T *p; |
|
|
| 107 | |
|
|
| 108 | auto_ptr () : p (0) { } |
|
|
| 109 | |
|
|
| 110 | explicit |
|
|
| 111 | auto_ptr (T *a) : p (a) { } |
|
|
| 112 | |
|
|
| 113 | auto_ptr (auto_ptr<T> &a) |
|
|
| 114 | { |
|
|
| 115 | p = a.p; |
|
|
| 116 | a.p = 0; |
|
|
| 117 | } |
|
|
| 118 | |
|
|
| 119 | template<typename A> |
|
|
| 120 | auto_ptr (auto_ptr<A> &a) |
|
|
| 121 | { |
|
|
| 122 | p = a.p; |
|
|
| 123 | a.p = 0; |
|
|
| 124 | } |
|
|
| 125 | |
|
|
| 126 | ~auto_ptr () |
|
|
| 127 | { |
|
|
| 128 | delete p; |
|
|
| 129 | } |
|
|
| 130 | |
|
|
| 131 | void reset (T *a) |
|
|
| 132 | { |
|
|
| 133 | delete p; |
|
|
| 134 | p = a; |
|
|
| 135 | } |
|
|
| 136 | |
|
|
| 137 | // void because it makes sense in our context |
|
|
| 138 | void operator =(auto_ptr &a) |
|
|
| 139 | { |
|
|
| 140 | *this = a.p; |
|
|
| 141 | a.p = 0; |
|
|
| 142 | } |
|
|
| 143 | |
|
|
| 144 | template<typename A> |
|
|
| 145 | void operator =(auto_ptr<A> &a) |
|
|
| 146 | { |
|
|
| 147 | *this = a.p; |
|
|
| 148 | a.p = 0; |
|
|
| 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 | |
