in release builds gcc on osx evaporates these inlines if not WXEXPORTed

[wxWidgets.git] / include / wx / vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 85d925794371ef7e0b162d2def26a4ce7eaf8823..d77962d7783d781c0f65ae9dbc7498af09270ccf 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -117,14 +117,58 @@ private:
 
 public:
     typedef size_t size_type;
+    typedef size_t difference_type;
     typedef T value_type;
+    typedef value_type* pointer;
     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
 
+    class reverse_iterator
+    {
+    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++(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 operator+(difference_type n) const
+                { return reverse_iterator(m_ptr - n); }
+        reverse_iterator& operator+=(difference_type n)
+                { return m_ptr -= n; return *this; }
+        reverse_iterator operator-(difference_type n) const
+                { return reverse_iterator(m_ptr + n); }
+        reverse_iterator& operator-=(difference_type n)
+                { return 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; }
+        bool operator !=(const reverse_iterator& it) const
+                { return m_ptr != it.m_ptr; }
+        
+    private:
+        value_type *m_ptr;
+    };
+
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
-    wxVector(const wxVector& c)
+    wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);
     }
@@ -144,7 +188,8 @@ public:
 
         Ops::Free(m_values);
         m_values = NULL;
-        m_size = m_capacity = 0;
+        m_size =
+        m_capacity = 0;
     }
 
     void reserve(size_type n)
@@ -184,6 +229,7 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
+        clear();
         Copy(vb);
         return *this;
     }
@@ -233,6 +279,9 @@ public:
     const_iterator end() const { return m_values + size(); }
     iterator end() { return m_values + size(); }
 
+    reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
+    reverse_iterator rend() { return reverse_iterator(begin() - 1); }
+
     iterator insert(iterator it, const value_type& v = value_type())
     {
         // NB: this must be done before reserve(), because reserve()
@@ -321,7 +370,6 @@ private:
 
     void Copy(const wxVector& vb)
     {
-        clear();
         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )