X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e966f815d45cbb4d1204e4f4ec770af947e45890..da52a4e023e73c2922f63d95026816a624695559:/include/wx/vector.h diff --git a/include/wx/vector.h b/include/wx/vector.h index 1c181c2c18..6fc0be174a 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -14,27 +14,30 @@ #include "wx/defs.h" -#if 0 // wxUSE_STL +#if wxUSE_STL -// FIXME: can't do this yet, wxVector::erase() is different (takes index, -// not iterator) #include #define wxVector std::vector #else // !wxUSE_STL +#include "wx/utils.h" + template class wxVector { public: typedef size_t size_type; typedef T value_type; + typedef value_type* iterator; + typedef const value_type* const_iterator; + typedef value_type& reference; - wxVector() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {} + wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} wxVector(const wxVector& c) { - wxCHECK2(Copy(c), return); + Copy(c); } ~wxVector() @@ -44,19 +47,38 @@ public: void clear() { - for (size_type i = 0; i < size(); i++) - delete m_objects[i]; - free(m_objects); - m_objects = 0; + delete[] m_values; + m_values = NULL; m_size = m_capacity = 0; } void reserve(size_type n) { - if ( !Alloc(n) ) + if ( n <= m_capacity ) + return; + + // increase the size twice, unless we're already too big or unless + // more is requested + // + // NB: casts to size_t are needed to suppress mingw32 warnings about + // mixing enums and ints in the same expression + const size_type increment = m_size > 0 + ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE) + : (size_type)ALLOC_INITIAL_SIZE; + if ( m_capacity + increment > n ) + n = m_capacity + increment; + + value_type *mem = new value_type[n]; + + if ( m_values ) { - wxFAIL_MSG( _T("out of memory in wxVector::reserve()") ); + for ( size_type i = 0; i < m_size; ++i ) + mem[i] = m_values[i]; + delete[] m_values; } + + m_values = mem; + m_capacity = n; } size_type size() const @@ -76,31 +98,31 @@ public: wxVector& operator=(const wxVector& vb) { - wxCHECK(Copy(vb), *this); + Copy(vb); return *this; } - void push_back(const value_type& o) + void push_back(const value_type& v) { - wxCHECK2(Alloc(size() + 1), return); - Append(new value_type(o)); + reserve(size() + 1); + m_values[m_size++] = v; } void pop_back() { - RemoveAt(size() - 1); + erase(end() - 1); } const value_type& at(size_type idx) const { wxASSERT(idx < m_size); - return *m_objects[idx]; + return m_values[idx]; } value_type& at(size_type idx) { wxASSERT(idx < m_size); - return *m_objects[idx]; + return m_values[idx]; } const value_type& operator[](size_type idx) const { return at(idx); } @@ -110,73 +132,88 @@ public: const value_type& back() const { return at(size() - 1); } value_type& back() { return at(size() - 1); } - size_type erase(size_type idx) - { - RemoveAt(idx); - return idx; - } + const_iterator begin() const { return m_values; } + iterator begin() { return m_values; } + const_iterator end() const { return m_values + size(); } + iterator end() { return m_values + size(); } -private: - bool Alloc(size_type sz) + iterator insert(iterator it, const value_type& v = value_type()) { - // work in multiples of m_allocsize; - sz = (sz / m_allocsize + 1) * m_allocsize; - if (sz <= m_capacity) - return true; + size_t idx = it - begin(); - // try to realloc - void *mem = realloc(m_objects, sizeof(value_type*) * sz); - if (! mem) - return false; // failed - // success - m_objects = (value_type **) mem; - m_capacity = sz; - return true; + reserve(size() + 1); + + // unless we're inserting at the end, move following values out of + // the way: + for ( size_t n = m_size; n != idx; --n ) + m_values[n] = m_values[n-1]; + + m_values[idx] = v; + m_size++; + + return begin() + idx; } - void Append(value_type *obj) + iterator erase(iterator it) { - wxASSERT(m_size < m_capacity); - m_objects[m_size] = obj; - m_size++; + return erase(it, it + 1); } - void RemoveAt(size_type idx) + iterator erase(iterator first, iterator last) { - wxASSERT(idx < m_size); - delete m_objects[idx]; - if (idx < m_size - 1) - memcpy( - m_objects + idx, - m_objects + idx + 1, - ( m_size - idx - 1 ) * sizeof(void*) ); - m_size--; + if ( first == last ) + return first; + wxASSERT( first < end() && last <= end() ); + + size_type index = first - begin(); + size_type count = last - first; + + // move the remaining values over to the freed space: + for ( iterator i = last; i < end(); ++i ) + *(i - count) = *i; + + // erase items behind the new end of m_values: + for ( iterator j = end() - count; j < end(); ++j ) + *j = value_type(); + + m_size -= count; + + return begin() + index; } - bool Copy(const wxVector& vb) +#if WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED( size_type erase(size_type n) ); +#endif // WXWIN_COMPATIBILITY_2_8 + +private: + // VC6 can't compile static const int members + enum { ALLOC_INITIAL_SIZE = 16 }; + enum { ALLOC_MAX_SIZE = 4096 }; + + void Copy(const wxVector& vb) { clear(); - if (! Alloc(vb.size())) - return false; + reserve(vb.size()); - for (size_type i = 0; i < vb.size(); i++) - { - value_type *o = new value_type(vb.at(i)); - if (! o) - return false; - Append(o); - } - - return true; + for ( const_iterator i = vb.begin(); i != vb.end(); ++i ) + push_back(*i); } private: - size_type m_allocsize; size_type m_size, m_capacity; - value_type **m_objects; + value_type *m_values; }; +#if WXWIN_COMPATIBILITY_2_8 +template +typename wxVector::size_type wxVector::erase(size_type n) +{ + erase(begin() + n); + return n; +} +#endif // WXWIN_COMPATIBILITY_2_8 + #endif // wxUSE_STL/!wxUSE_STL #if WXWIN_COMPATIBILITY_2_8