bracket unused function

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index e2faf83569e9ac8c81c904370d5fc16e1b3d509f..1d785e949d1b043f04fb4f8cf362fee84e8dd47e 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -17,7 +17,14 @@
 #if wxUSE_STL
 
 #include <vector>
 #if wxUSE_STL
 
 #include <vector>

+#include <algorithm>
+

 #define wxVector std::vector
 #define wxVector std::vector

+template<typename T>
+inline void wxVectorSort(wxVector<T>& v)
+{
+    std::sort(v.begin(), v.end());
+}

 
 #else // !wxUSE_STL
 
 
 #else // !wxUSE_STL
 


@@ -66,7 +73,7 @@ struct wxVectorMemOpsGeneric
         T *mem = (T*)::operator new(newCapacity * sizeof(T));
         for ( size_t i = 0; i < occupiedSize; i++ )
         {
         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);
             old[i].~T();
         }
         ::operator delete(old);


@@ -80,7 +87,7 @@ struct wxVectorMemOpsGeneric
         T* sourceptr = source;
         for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
         {
         T* sourceptr = source;
         for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
         {

-            new(destptr) T(*sourceptr);
+            ::new(destptr) T(*sourceptr);

             sourceptr->~T();
         }
     }
             sourceptr->~T();
         }
     }


@@ -92,7 +99,7 @@ struct wxVectorMemOpsGeneric
         T* sourceptr = source + count - 1;
         for ( size_t i = count; i > 0; --i, --destptr, --sourceptr )
         {
         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();
         }
     }
             sourceptr->~T();
         }
     }


@@ -111,7 +118,10 @@ private:
     // 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.
     // 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;
                            wxPrivate::wxVectorMemOpsMovable<T>,
                            wxPrivate::wxVectorMemOpsGeneric<T> >::value
             Ops;


@@ -131,44 +141,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) { }
         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; }
         reference operator*() const { return *m_ptr; }
         pointer operator->() const { return m_ptr; }

-        
+

         iterator base() 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 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
         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)
         reverse_iterator& operator+=(difference_type n)

-                { return m_ptr -= n; return *this; }
+            { m_ptr -= n; return *this; }

         reverse_iterator operator-(difference_type n) const
         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)
         reverse_iterator& operator-=(difference_type n)

-                { return m_ptr += n; return *this; }
-                
+            { m_ptr += n; return *this; }
+

         reference operator[](difference_type n) const
         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
         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) {}
 
     private:
         value_type *m_ptr;
     };
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 

+    wxVector(size_type p_size)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(value_type());
+    }
+
+    wxVector(size_type p_size, const value_type& v)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+

     wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);
     wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);


@@ -179,6 +205,13 @@ public:
         clear();
     }
 
         clear();
     }
 

+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+

     void clear()
     {
         // call destructors of stored objects:
     void clear()
     {
         // call destructors of stored objects:


@@ -213,6 +246,22 @@ public:
         m_capacity = n;
     }
 
         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;
     size_type size() const
     {
         return m_size;


@@ -230,8 +279,11 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
 
     wxVector& operator=(const wxVector& vb)
     {

-        clear();
-        Copy(vb);
+        if (this != &vb)
+        {
+            clear();
+            Copy(vb);
+        }

         return *this;
     }
 
         return *this;
     }
 


@@ -242,7 +294,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;
         // 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
 
         // 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


@@ -309,7 +361,7 @@ public:
 
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:
 
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:

-        new(place) value_type(v);
+        ::new(place) value_type(v);

 
         // now that we did successfully add the new element, increment the size
         // and disable moving the items back
 
         // now that we did successfully add the new element, increment the size
         // and disable moving the items back


@@ -367,6 +419,20 @@ private:
     }
 
 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;
     size_type m_size,
               m_capacity;
     value_type *m_values;


@@ -381,6 +447,44 @@ inline typename wxVector<T>::size_type wxVector<T>::erase(size_type n)
 }
 #endif // WXWIN_COMPATIBILITY_2_8
 
 }
 #endif // WXWIN_COMPATIBILITY_2_8
 

+
+
+namespace wxPrivate
+{
+
+// This is a helper for the wxVectorSort function, and should not be used
+// directly in user's code.
+template<typename T>
+struct wxVectorComparator
+{
+    static int wxCMPFUNC_CONV
+    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
+
+
+
+template<typename T>
+void wxVectorSort(wxVector<T>& v)
+{
+    wxQsort(v.begin(), v.size(), sizeof(T),
+            wxPrivate::wxVectorComparator<T>::Compare, NULL);
+}
+
+
+

 #endif // wxUSE_STL/!wxUSE_STL
 
 #if WXWIN_COMPATIBILITY_2_8
 #endif // wxUSE_STL/!wxUSE_STL
 
 #if WXWIN_COMPATIBILITY_2_8