1.1 --- a/sourcehook/sh_vector.h Tue Oct 16 19:02:33 2007 +0000
1.2 +++ b/sourcehook/sh_vector.h Tue Oct 16 20:01:30 2007 +0000
1.3 @@ -19,39 +19,58 @@
1.4 // Vector
1.5 template <class T> class CVector
1.6 {
1.7 - bool Grow()
1.8 + bool Grow(size_t amount)
1.9 {
1.10 // automatic grow
1.11 size_t newSize = m_Size * 2;
1.12 +
1.13 if (newSize == 0)
1.14 - newSize = 8; // a good init value
1.15 + {
1.16 + newSize = 8;
1.17 + }
1.18 +
1.19 + while (m_CurrentUsedSize + amount > newSize)
1.20 + {
1.21 + newSize *= 2;
1.22 + }
1.23 +
1.24 T *newData = new T[newSize];
1.25 - if (!newData)
1.26 - return false;
1.27 +
1.28 if (m_Data)
1.29 {
1.30 for (size_t i=0; i<m_CurrentUsedSize; i++)
1.31 + {
1.32 newData[i] = m_Data[i];
1.33 + }
1.34 +
1.35 delete [] m_Data;
1.36 }
1.37 +
1.38 m_Data = newData;
1.39 m_Size = newSize;
1.40 +
1.41 return true;
1.42 }
1.43
1.44 - bool GrowIfNeeded()
1.45 + bool GrowIfNeeded(size_t amount)
1.46 {
1.47 - if (m_CurrentUsedSize >= m_Size)
1.48 - return Grow();
1.49 + if (m_CurrentUsedSize + amount >= m_Size)
1.50 + {
1.51 + return Grow(amount);
1.52 + }
1.53 else
1.54 + {
1.55 return true;
1.56 + }
1.57 }
1.58
1.59 bool ChangeSize(size_t size)
1.60 {
1.61 // change size
1.62 if (size == m_Size)
1.63 + {
1.64 return true;
1.65 + }
1.66
1.67 if (!size)
1.68 {
1.69 @@ -65,19 +84,24 @@
1.70 }
1.71
1.72 T *newData = new T[size];
1.73 - if (!newData)
1.74 - return false;
1.75 +
1.76 if (m_Data)
1.77 {
1.78 size_t end = (m_CurrentUsedSize < size) ? (m_CurrentUsedSize) : size;
1.79 for (size_t i=0; i<end; i++)
1.80 + {
1.81 newData[i] = m_Data[i];
1.82 + }
1.83 +
1.84 delete [] m_Data;
1.85 }
1.86 m_Data = newData;
1.87 m_Size = size;
1.88 +
1.89 if (m_CurrentUsedSize > m_Size)
1.90 + {
1.91 m_CurrentUsedSize = m_Size;
1.92 + }
1.93
1.94 return true;
1.95 }
1.96 @@ -85,7 +109,9 @@
1.97 void FreeMemIfPossible()
1.98 {
1.99 if (!m_Data)
1.100 + {
1.101 return;
1.102 + }
1.103
1.104 if (!m_CurrentUsedSize)
1.105 {
1.106 @@ -95,10 +121,14 @@
1.107
1.108 size_t newSize = m_Size;
1.109 while (m_CurrentUsedSize <= newSize / 2)
1.110 + {
1.111 newSize /= 2;
1.112 + }
1.113
1.114 if (newSize != m_Size)
1.115 + {
1.116 ChangeSize(newSize);
1.117 + }
1.118 }
1.119 protected:
1.120 T *m_Data;
1.121 @@ -321,14 +351,13 @@
1.122
1.123 bool push_back(const T & elem)
1.124 {
1.125 - ++m_CurrentUsedSize;
1.126 - if (!GrowIfNeeded())
1.127 + if (!GrowIfNeeded(1))
1.128 {
1.129 - --m_CurrentUsedSize;
1.130 return false;
1.131 }
1.132
1.133 - m_Data[m_CurrentUsedSize - 1] = elem;
1.134 + m_Data[m_CurrentUsedSize++] = elem;
1.135 +
1.136 return true;
1.137 }
1.138
1.139 @@ -433,13 +462,13 @@
1.140
1.141 size_t ofs = where - begin();
1.142
1.143 - ++m_CurrentUsedSize;
1.144 - if (!GrowIfNeeded())
1.145 + if (!GrowIfNeeded(1))
1.146 {
1.147 - --m_CurrentUsedSize;
1.148 return false;
1.149 }
1.150
1.151 + ++m_CurrentUsedSize;
1.152 +
1.153 where = begin() + ofs;
1.154
1.155 // Move subsequent entries