#include "wx/defs.h"
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
#include <vector>
+#include <algorithm>
+
#define wxVector std::vector
template<typename T>
inline void wxVectorSort(wxVector<T>& v)
std::sort(v.begin(), v.end());
}
-#else // !wxUSE_STL
+#else // !wxUSE_STD_CONTAINERS
-#include "wx/utils.h"
#include "wx/scopeguard.h"
#include "wx/meta/movable.h"
#include "wx/meta/if.h"
#include <new> // for placement new
#include "wx/afterstd.h"
+// wxQsort is declared in wx/utils.h, but can't include that file here,
+// it indirectly includes this file. Just lovely...
+typedef int (*wxSortCallback)(const void* pItem1,
+ const void* pItem2,
+ const void* user_data);
+WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
+ size_t size, wxSortCallback cmp,
+ const void* user_data);
+
namespace wxPrivate
{
// Note that we use typedef instead of privately deriving from this (which
// would allowed us to omit "Ops::" prefixes below) to keep VC6 happy,
// it can't compile code that derives from wxIf<...>::value.
- typedef typename wxIf< wxIsMovable<T>::value,
+ //
+ // Note that bcc needs the extra parentheses for non-type template
+ // arguments to compile this expression.
+ typedef typename wxIf< (wxIsMovable<T>::value),
wxPrivate::wxVectorMemOpsMovable<T>,
wxPrivate::wxVectorMemOpsGeneric<T> >::value
Ops;
typedef size_t difference_type;
typedef T value_type;
typedef value_type* pointer;
+ typedef const value_type* const_pointer;
typedef value_type* iterator;
typedef const value_type* const_iterator;
typedef value_type& reference;
+ typedef const value_type& const_reference;
class reverse_iterator
{
private:
value_type *m_ptr;
+
+ friend class const_reverse_iterator;
+ };
+
+ class const_reverse_iterator
+ {
+ public:
+ const_reverse_iterator() : m_ptr(NULL) { }
+ wxEXPLICIT const_reverse_iterator(const_iterator it) : m_ptr(it) { }
+ const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
+ const_reverse_iterator(const const_reverse_iterator& it) : m_ptr(it.m_ptr) { }
+
+ const_reference operator*() const { return *m_ptr; }
+ const_pointer operator->() const { return m_ptr; }
+
+ const_iterator base() const { return m_ptr; }
+
+ const_reverse_iterator& operator++()
+ { --m_ptr; return *this; }
+ const_reverse_iterator operator++(int)
+ { const_reverse_iterator tmp = *this; --m_ptr; return tmp; }
+ const_reverse_iterator& operator--()
+ { ++m_ptr; return *this; }
+ const_reverse_iterator operator--(int)
+ { const_reverse_iterator tmp = *this; ++m_ptr; return tmp; }
+
+ const_reverse_iterator operator+(difference_type n) const
+ { return const_reverse_iterator(m_ptr - n); }
+ const_reverse_iterator& operator+=(difference_type n)
+ { m_ptr -= n; return *this; }
+ const_reverse_iterator operator-(difference_type n) const
+ { return const_reverse_iterator(m_ptr + n); }
+ const_reverse_iterator& operator-=(difference_type n)
+ { m_ptr += n; return *this; }
+
+ const_reference operator[](difference_type n) const
+ { return *(*this + n); }
+
+ bool operator ==(const const_reverse_iterator& it) const
+ { return m_ptr == it.m_ptr; }
+ bool operator !=(const const_reverse_iterator& it) const
+ { return m_ptr != it.m_ptr; }
+
+ protected:
+ const value_type *m_ptr;
};
wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
clear();
}
+ void assign(size_type p_size, const value_type& v)
+ {
+ clear();
+ reserve(p_size);
+ for ( size_t n = 0; n < p_size; n++ )
+ push_back(v);
+ }
+
void swap(wxVector& v)
{
wxSwap(m_size, v.m_size);
// increase the size twice, unless we're already too big or unless
// more is requested
//
- // NB: casts to size_type are needed to suppress mingw32 warnings about
- // mixing enums and ints in the same expression
+ // NB: casts to size_type are needed to suppress warnings about
+ // mixing enumeral and non-enumeral type in conditional expression
const size_type increment = m_size > 0
- ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE)
+ ? m_size < ALLOC_MAX_SIZE
+ ? m_size
+ : (size_type)ALLOC_MAX_SIZE
: (size_type)ALLOC_INITIAL_SIZE;
if ( m_capacity + increment > n )
n = m_capacity + increment;
reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
reverse_iterator rend() { return reverse_iterator(begin() - 1); }
+ const_reverse_iterator rbegin() const { return const_reverse_iterator(end() - 1); }
+ const_reverse_iterator rend() const { return const_reverse_iterator(begin() - 1); }
+
iterator insert(iterator it, const value_type& v = value_type())
{
// NB: this must be done before reserve(), because reserve()
namespace wxPrivate
{
- // This function is a helper for the wxVectorSort function, and should
- // not be used directly in user's code.
+// This is a helper for the wxVectorSort function, and should not be used
+// directly in user's code.
template<typename T>
-int wxVectorSort_compare(const void* pitem1, const void* pitem2, const void* )
+struct wxVectorComparator
{
- const T& item1 = *reinterpret_cast<const T*>(pitem1);
- const T& item2 = *reinterpret_cast<const T*>(pitem2);
-
- if (item1 < item2)
- return -1;
- else if (item2 < item1)
- return 1;
- else
- return 0;
-}
+ static int
+ Compare(const void* pitem1, const void* pitem2, const void* )
+ {
+ const T& item1 = *reinterpret_cast<const T*>(pitem1);
+ const T& item2 = *reinterpret_cast<const T*>(pitem2);
+
+ if (item1 < item2)
+ return -1;
+ else if (item2 < item1)
+ return 1;
+ else
+ return 0;
+ }
+};
} // namespace wxPrivate
void wxVectorSort(wxVector<T>& v)
{
wxQsort(v.begin(), v.size(), sizeof(T),
- wxPrivate::wxVectorSort_compare<T>, NULL);
+ wxPrivate::wxVectorComparator<T>::Compare, NULL);
}
-#endif // wxUSE_STL/!wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
#if WXWIN_COMPATIBILITY_2_8
#define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls
projects / wxWidgets.git / blobdiff