#else // !wxUSE_STL
#include "wx/utils.h"
+#include "wx/scopeguard.h"
#include "wx/meta/movable.h"
#include "wx/meta/if.h"
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);
T* sourceptr = source;
for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
{
- new(destptr) T(*sourceptr);
+ ::new(destptr) T(*sourceptr);
sourceptr->~T();
}
}
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();
}
}
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);
wxVector& operator=(const wxVector& vb)
{
- clear();
- Copy(vb);
+ if (this != &vb)
+ {
+ clear();
+ Copy(vb);
+ }
return *this;
}
// 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
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();
+
+ // use placement new to initialize new object in preallocated place in
+ // m_values and store 'v' in it:
+ ::new(place) value_type(v);
- // 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
+ // 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;
projects / wxWidgets.git / blobdiff