Minor corrections to make dist after reports

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 9de3d724672cd0537cc2d5e8d210e01f31d32f7b..df491781a048997376e258f80019d595d8eaebed 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -22,14 +22,99 @@
 #else // !wxUSE_STL
 
 #include "wx/utils.h"
 #else // !wxUSE_STL
 
 #include "wx/utils.h"

+#include "wx/meta/movable.h"
+#include "wx/meta/if.h"

 
 #include "wx/beforestd.h"
 #include <new> // for placement new
 #include "wx/afterstd.h"
 
 
 #include "wx/beforestd.h"
 #include <new> // for placement new
 #include "wx/afterstd.h"
 

+namespace wxPrivate
+{
+
+// These templates encapsulate memory operations for use by wxVector; there are
+// two implementations, both in generic way for any C++ types and as an
+// optimized version for "movable" types that uses realloc() and memmove().
+
+// version for movable types:
+template<typename T>
+struct wxVectorMemOpsMovable
+{
+    static void Free(T* array)
+        { free(array); }
+
+    static T* Realloc(T* old, size_t newCapacity, size_t WXUNUSED(occupiedSize))
+        { return (T*)realloc(old, newCapacity * sizeof(T)); }
+
+    static void MemmoveBackward(T* dest, T* source, size_t count)
+        { memmove(dest, source, count * sizeof(T)); }
+
+    static void MemmoveForward(T* dest, T* source, size_t count)
+        { memmove(dest, source, count * sizeof(T)); }
+};
+
+// generic version for non-movable types:
+template<typename T>
+struct wxVectorMemOpsGeneric
+{
+    static void Free(T* array)
+        { ::operator delete(array); }
+
+    static T* Realloc(T* old, size_t newCapacity, size_t occupiedSize)
+    {
+        T *mem = (T*)::operator new(newCapacity * sizeof(T));
+        for ( size_t i = 0; i < occupiedSize; i++ )
+        {
+            new(mem + i) T(old[i]);
+            old[i].~T();
+        }
+        ::operator delete(old);
+        return mem;
+    }
+
+    static void MemmoveBackward(T* dest, T* source, size_t count)
+    {
+        wxASSERT( dest < source );
+        T* destptr = dest;
+        T* sourceptr = source;
+        for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
+        {
+            new(destptr) T(*sourceptr);
+            sourceptr->~T();
+        }
+    }
+
+    static void MemmoveForward(T* dest, T* source, size_t count)
+    {
+        wxASSERT( dest > source );
+        T* destptr = dest + count - 1;
+        T* sourceptr = source + count - 1;
+        for ( size_t i = count; i > 0; --i, --destptr, --sourceptr )
+        {
+            new(destptr) T(*sourceptr);
+            sourceptr->~T();
+        }
+    }
+};
+
+
+} // namespace wxPrivate
+

 template<typename T>
 class wxVector
 {
 template<typename T>
 class wxVector
 {

+private:
+    // This cryptic expression means "typedef Ops to wxVectorMemOpsMovable if
+    // type T is movable type, otherwise to wxVectorMemOpsGeneric".
+    //
+    // 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,
+                           wxPrivate::wxVectorMemOpsMovable<T>,
+                           wxPrivate::wxVectorMemOpsGeneric<T> >::value
+            Ops;
+

 public:
     typedef size_t size_type;
     typedef T value_type;
 public:
     typedef size_t size_type;
     typedef T value_type;


@@ -39,7 +124,7 @@ public:
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
 
     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);
     }
     {
         Copy(c);
     }


@@ -57,9 +142,10 @@ public:
             m_values[i].~T();
         }
 
             m_values[i].~T();
         }
 

-        free(m_values);
+        Ops::Free(m_values);

         m_values = NULL;
         m_values = NULL;

-        m_size = m_capacity = 0;
+        m_size =
+        m_capacity = 0;

     }
 
     void reserve(size_type n)
     }
 
     void reserve(size_type n)


@@ -78,8 +164,7 @@ public:
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
 
         if ( m_capacity + increment > n )
             n = m_capacity + increment;
 

-        m_values = (value_type*)realloc(m_values, n * sizeof(value_type));
-
+        m_values = Ops::Realloc(m_values, n * sizeof(value_type), m_size);

         m_capacity = n;
     }
 
         m_capacity = n;
     }
 


@@ -100,6 +185,7 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
 
     wxVector& operator=(const wxVector& vb)
     {

+        clear();

         Copy(vb);
         return *this;
     }
         Copy(vb);
         return *this;
     }


@@ -162,9 +248,7 @@ public:
         // the way:
         if ( after > 0 )
         {
         // the way:
         if ( after > 0 )
         {

-            memmove(m_values + idx + 1,
-                    m_values + idx,
-                    after * sizeof(value_type));
+            Ops::MemmoveForward(m_values + idx + 1, m_values + idx, after);

         }
 
 #if wxUSE_EXCEPTIONS
         }
 
 #if wxUSE_EXCEPTIONS


@@ -183,9 +267,7 @@ public:
             // back to their original positions in m_values
             if ( after > 0 )
             {
             // back to their original positions in m_values
             if ( after > 0 )
             {

-                memmove(m_values + idx,
-                        m_values + idx + 1,
-                        after * sizeof(value_type));
+                Ops::MemmoveBackward(m_values + idx, m_values + idx + 1, after);

             }
 
             throw; // rethrow the exception
             }
 
             throw; // rethrow the exception


@@ -217,14 +299,12 @@ public:
 
         // erase elements by calling their destructors:
         for ( iterator i = first; i < last; ++i )
 
         // erase elements by calling their destructors:
         for ( iterator i = first; i < last; ++i )

-            i->~value_type();
+            i->~T();

 
         // once that's done, move following elements over to the freed space:
         if ( after > 0 )
         {
 
         // once that's done, move following elements over to the freed space:
         if ( after > 0 )
         {

-            memmove(m_values + idx,
-                    m_values + idx + count,
-                    after * sizeof(value_type));
+            Ops::MemmoveBackward(m_values + idx, m_values + idx + count, after);

         }
 
         m_size -= count;
         }
 
         m_size -= count;


@@ -243,7 +323,6 @@ private:
 
     void Copy(const wxVector& vb)
     {
 
     void Copy(const wxVector& vb)
     {

-        clear();

         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )
         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )