X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/946954d3bf0eaa9b6e54193b08b30aa9768fc735..613de0e89efab1cbf8463ea06e0cf0b2914fbce9:/include/wx/vector.h diff --git a/include/wx/vector.h b/include/wx/vector.h index d77962d778..ab07ca0f4a 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -22,6 +22,7 @@ #else // !wxUSE_STL #include "wx/utils.h" +#include "wx/scopeguard.h" #include "wx/meta/movable.h" #include "wx/meta/if.h" @@ -65,7 +66,7 @@ struct wxVectorMemOpsGeneric T *mem = (T*)::operator new(newCapacity * sizeof(T)); for ( size_t i = 0; i < occupiedSize; i++ ) { - new(mem + i) T(old[i]); + ::new(mem + i) T(old[i]); old[i].~T(); } ::operator delete(old); @@ -79,7 +80,7 @@ struct wxVectorMemOpsGeneric T* sourceptr = source; for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr ) { - new(destptr) T(*sourceptr); + ::new(destptr) T(*sourceptr); sourceptr->~T(); } } @@ -91,7 +92,7 @@ struct wxVectorMemOpsGeneric T* sourceptr = source + count - 1; for ( size_t i = count; i > 0; --i, --destptr, --sourceptr ) { - new(destptr) T(*sourceptr); + ::new(destptr) T(*sourceptr); sourceptr->~T(); } } @@ -130,44 +131,60 @@ public: reverse_iterator() : m_ptr(NULL) { } wxEXPLICIT reverse_iterator(iterator it) : m_ptr(it) { } reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { } - + reference operator*() const { return *m_ptr; } pointer operator->() const { return m_ptr; } - + iterator base() const { return m_ptr; } - - reverse_iterator& operator++() - { --m_ptr; return *this; } + + reverse_iterator& operator++() + { --m_ptr; return *this; } reverse_iterator operator++(int) - { reverse_iterator tmp = *this; --m_ptr; return tmp; } - reverse_iterator& operator--() - { ++m_ptr; return *this; } - reverse_iterator operator--(int) - { reverse_iterator tmp = *this; ++m_ptr; return tmp; } - + { reverse_iterator tmp = *this; --m_ptr; return tmp; } + reverse_iterator& operator--() + { ++m_ptr; return *this; } + reverse_iterator operator--(int) + { reverse_iterator tmp = *this; ++m_ptr; return tmp; } + reverse_iterator operator+(difference_type n) const - { return reverse_iterator(m_ptr - n); } + { return reverse_iterator(m_ptr - n); } reverse_iterator& operator+=(difference_type n) - { return m_ptr -= n; return *this; } + { m_ptr -= n; return *this; } reverse_iterator operator-(difference_type n) const - { return reverse_iterator(m_ptr + n); } + { return reverse_iterator(m_ptr + n); } reverse_iterator& operator-=(difference_type n) - { return m_ptr += n; return *this; } - + { m_ptr += n; return *this; } + reference operator[](difference_type n) const - { return *(*this + n); } - - bool operator ==(const reverse_iterator& it) const - { return m_ptr == it.m_ptr; } + { return *(*this + n); } + + bool operator ==(const reverse_iterator& it) const + { return m_ptr == it.m_ptr; } bool operator !=(const reverse_iterator& it) const - { return m_ptr != it.m_ptr; } - + { return m_ptr != it.m_ptr; } + private: value_type *m_ptr; }; wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} + wxVector(size_type size) + : m_size(0), m_capacity(0), m_values(NULL) + { + reserve(size); + for ( size_t n = 0; n < size; n++ ) + push_back(value_type()); + } + + wxVector(size_type size, const value_type& v) + : m_size(0), m_capacity(0), m_values(NULL) + { + reserve(size); + for ( size_t n = 0; n < size; n++ ) + push_back(v); + } + wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL) { Copy(c); @@ -212,6 +229,22 @@ public: m_capacity = n; } + void resize(size_type n) + { + if ( n < m_size ) + Shrink(n); + else if ( n > m_size ) + Extend(n, value_type()); + } + + void resize(size_type n, const value_type& v) + { + if ( n < m_size ) + Shrink(n); + else if ( n > m_size ) + Extend(n, v); + } + size_type size() const { return m_size; @@ -229,8 +262,11 @@ public: wxVector& operator=(const wxVector& vb) { - clear(); - Copy(vb); + if (this != &vb) + { + clear(); + Copy(vb); + } return *this; } @@ -241,7 +277,7 @@ public: // use placement new to initialize new object in preallocated place in // m_values and store 'v' in it: void* const place = m_values + m_size; - new(place) value_type(v); + ::new(place) value_type(v); // only increase m_size if the ctor didn't throw an exception; notice // that if it _did_ throw, everything is OK, because we only increased @@ -291,39 +327,28 @@ public: reserve(size() + 1); + // the place where the new element is going to be inserted + value_type * const place = m_values + idx; + // unless we're inserting at the end, move following elements out of // the way: if ( after > 0 ) - { - Ops::MemmoveForward(m_values + idx + 1, m_values + idx, after); - } + Ops::MemmoveForward(place + 1, place, after); -#if wxUSE_EXCEPTIONS - try - { -#endif - // use placement new to initialize new object in preallocated place - // in m_values and store 'v' in it: - void* const place = m_values + idx; - new(place) value_type(v); -#if wxUSE_EXCEPTIONS - } - catch ( ... ) - { - // if the ctor threw an exception, we need to move all the elements - // back to their original positions in m_values - if ( after > 0 ) - { - Ops::MemmoveBackward(m_values + idx, m_values + idx + 1, after); - } - - throw; // rethrow the exception - } -#endif // wxUSE_EXCEPTIONS + // if the ctor called below throws an exception, we need to move all + // the elements back to their original positions in m_values + wxScopeGuard moveBack = wxMakeGuard( + Ops::MemmoveBackward, place, place + 1, after); + if ( !after ) + moveBack.Dismiss(); - // increment m_size only if ctor didn't throw -- if it did, we'll be - // left with m_values larger than necessary, but number of elements will - // be the same + // use placement new to initialize new object in preallocated place in + // m_values and store 'v' in it: + ::new(place) value_type(v); + + // now that we did successfully add the new element, increment the size + // and disable moving the items back + moveBack.Dismiss(); m_size++; return begin() + idx; @@ -377,6 +402,20 @@ private: } private: + void Shrink(size_type n) + { + for ( size_type i = n; i < m_size; i++ ) + m_values[i].~T(); + m_size = n; + } + + void Extend(size_type n, const value_type& v) + { + reserve(n); + for ( size_type i = m_size; i < n; i++ ) + push_back(v); + } + size_type m_size, m_capacity; value_type *m_values;