ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libptytty/src/estl.h
(Generate patch)

Comparing libptytty/src/estl.h (file contents):
Revision 1.20 by root, Thu May 24 12:56:37 2012 UTC vs.
Revision 1.29 by sf-exg, Thu Nov 13 13:58:12 2014 UTC

… …
20 return first; 20 return first;
21} 21}
22 22
23#include <new> 23#include <new>
24 24
25#if __cplusplus >= 201103L 25#if ECB_CPP11
26 #include <type_traits> 26 #include <type_traits>
27#endif 27#endif
28
29namespace estl
30{
31#if ESTL_LARGE_MEMORY_MODEL
32 // should use size_t/ssize_t, but that's not portable enough for us
33 typedef unsigned long size_type;
34 typedef long difference_type;
35#else
36 typedef uint32_t size_type;
37 typedef int32_t difference_type;
38#endif
39
40 template<typename T>
41 struct scoped_ptr
42 {
43 T *p;
44
45 scoped_ptr () : p (0) { }
46
47 explicit
48 scoped_ptr (T *a) : p (a) { }
49
50 ~scoped_ptr ()
51 {
52 delete p;
53 }
54
55 void reset (T *a)
56 {
57 delete p;
58 p = a;
59 }
60
61 T *operator ->() const { return p; }
62 T &operator *() const { return *p; }
63
64 operator T *() { return p; }
65 T *get () const { return p; }
66
67 private:
68 scoped_ptr (const scoped_ptr &);
69 scoped_ptr &operator =(const scoped_ptr &);
70 };
71
72 template<typename T>
73 struct scoped_array
74 {
75 T *p;
76
77 scoped_array () : p (0) { }
78
79 explicit
80 scoped_array (T *a) : p (a) { }
81
82 ~scoped_array ()
83 {
84 delete [] p;
85 }
86
87 void reset (T *a)
88 {
89 delete [] p;
90 p = a;
91 }
92
93 operator T *() { return p; }
94 T *get () const { return p; }
95
96 private:
97 scoped_array (const scoped_array &);
98 scoped_array &operator =(const scoped_array &);
99 };
100}
28 101
29// original version taken from MICO, but this has been completely rewritten 102// original version taken from MICO, but this has been completely rewritten
30// known limitations w.r.t. std::vector 103// known limitations w.r.t. std::vector
31// - many methods missing 104// - many methods missing
32// - no error checking, no exceptions thrown (e.g. at()) 105// - no error checking, no exceptions thrown (e.g. at())
… …
36// - we don't care about namespaces and stupid macros the user might define 109// - we don't care about namespaces and stupid macros the user might define
37// - no bool specialisation 110// - no bool specialisation
38template<class T> 111template<class T>
39struct simplevec 112struct simplevec
40{ 113{
41#if ESTL_BIG_VECTOR 114 typedef estl::size_type size_type;
42 // shoudl use size_t/ssize_t, but that's not portable enough for us
43 typedef unsigned long size_type;
44 typedef long difference_type;
45#else
46 typedef uint32_t size_type;
47 typedef int32_t difference_type;
48#endif
49 115
50 typedef T value_type; 116 typedef T value_type;
51 typedef T *iterator; 117 typedef T *iterator;
52 typedef const T *const_iterator; 118 typedef const T *const_iterator;
53 typedef T *pointer; 119 typedef T *pointer;
… …
63 129
64 // we shamelessly optimise for "simple" types. everything 130 // we shamelessly optimise for "simple" types. everything
65 // "not simple enough" will use the slow path. 131 // "not simple enough" will use the slow path.
66 static bool is_simple_enough () 132 static bool is_simple_enough ()
67 { 133 {
68 #if __cplusplus >= 201103L 134 #if ECB_CPP11
69 return std::is_trivially_assignable<T, T>::value 135 return std::is_trivially_assignable<T, T>::value
70 && std::is_trivially_constructable<T>::value 136 && std::is_trivially_constructible<T>::value
71 && std::is_trivially_copyable<T>::value 137 && std::is_trivially_copyable<T>::value
72 && std::is_trivially_destructible<T>::value; 138 && std::is_trivially_destructible<T>::value;
73 #elif ECB_GCC_VERSION(4,4) 139 #elif ECB_GCC_VERSION(4,4) || ECB_CLANG_VERSION(2,8)
74 return __has_trivial_assign (T) 140 return __has_trivial_assign (T)
75 && __has_trivial_constructor (T) 141 && __has_trivial_constructor (T)
76 && __has_trivial_copy (T) 142 && __has_trivial_copy (T)
77 && __has_trivial_destructor (T); 143 && __has_trivial_destructor (T);
78 #else 144 #else
… …
145 buf = nbuf; 211 buf = nbuf;
146 } 212 }
147 213
148 construct (buf + sze, n); 214 construct (buf + sze, n);
149 215
150 sze += n;
151
152 iterator src = buf + pos; 216 iterator src = buf + pos;
153 if (is_simple_enough ()) 217 if (is_simple_enough ())
154 memmove (src + n, src, sizeof (T) * n); 218 memmove (src + n, src, sizeof (T) * (sze - pos));
155 else 219 else
156 for (size_type i = n; i--; ) 220 for (size_type i = sze - pos; i--; )
157 cop_set (src + n + i, src + i); 221 cop_set (src + n + i, src + i);
222
223 sze += n;
158 } 224 }
159 225
160public: 226public:
161 size_type capacity () const { return res; } 227 size_type capacity () const { return res; }
162 size_type size () const { return sze; } 228 size_type size () const { return sze; }
… …
216 282
217 while (n--) 283 while (n--)
218 new (buf + n) T (t); 284 new (buf + n) T (t);
219 } 285 }
220 286
221 template<class I> 287 simplevec (const_iterator first, const_iterator last)
222 simplevec (I first, I last)
223 { 288 {
224 sze = res = last - first; 289 sze = res = last - first;
225 buf = alloc (sze); 290 buf = alloc (sze);
226 copy (buf, first, sze, cop_new); 291 copy (buf, first, sze, cop_new);
227 } 292 }
… …
267 reference operator [](size_type idx) { return buf[idx]; } 332 reference operator [](size_type idx) { return buf[idx]; }
268 333
269 const_reference at (size_type idx) const { return buf [idx]; } 334 const_reference at (size_type idx) const { return buf [idx]; }
270 reference at (size_type idx) { return buf [idx]; } 335 reference at (size_type idx) { return buf [idx]; }
271 336
272 template<class I> 337 void assign (const_iterator first, const_iterator last)
273 void assign (I first, I last)
274 { 338 {
275 swap (simplevec<T> (first, last)); 339 simplevec<T> v (first, last);
340 swap (v);
276 } 341 }
277 342
278 void assign (size_type n, const T &t) 343 void assign (size_type n, const T &t)
279 { 344 {
280 swap (simplevec<T> (n, t)); 345 simplevec<T> v (n, t);
346 swap (v);
281 } 347 }
282 348
283 simplevec<T> &operator= (const simplevec<T> &v) 349 simplevec<T> &operator= (const simplevec<T> &v)
284 { 350 {
285 assign (v.begin (), v.end ()); 351 assign (v.begin (), v.end ());
… …
294 buf [at] = t; 360 buf [at] = t;
295 361
296 return buf + at; 362 return buf + at;
297 } 363 }
298 364
299 template<class I>
300 iterator insert (iterator pos, I first, I last) 365 iterator insert (iterator pos, const_iterator first, const_iterator last)
301 { 366 {
302 size_type n = last - first; 367 size_type n = last - first;
303 size_type at = pos - begin (); 368 size_type at = pos - begin ();
304 369
305 ins (pos, n); 370 ins (pos, n);
… …
326 size_type c = end () - last; 391 size_type c = end () - last;
327 392
328 if (is_simple_enough ()) 393 if (is_simple_enough ())
329 memmove (first, last, sizeof (T) * c); 394 memmove (first, last, sizeof (T) * c);
330 else 395 else
331 copy<iterator> (first, last, c, cop_set); 396 copy (first, last, c, cop_set);
332 397
333 sze -= n; 398 sze -= n;
334 destruct (buf + sze, n); 399 destruct (buf + sze, n);
335 400
336 return first; 401 return first;

Diff Legend

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