SQL Server and (preliminary) DB2 support added

[wxWidgets.git] / src / common / dynarray.cpp

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 04d89832e16d5f579b422ce281a3df14913abb02..bbf54265c431b7eb1d996e0b5a9e224e001a773d 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -261,9 +261,9 @@ void wxBaseArray::Insert(long lItem, size_t nIndex)
 }
 
 // removes item from array (by index)
 }
 
 // removes item from array (by index)

-void wxBaseArray::Remove(size_t nIndex)
+void wxBaseArray::RemoveAt(size_t nIndex)

 {
 {

-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Remove") );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::RemoveAt") );

 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
           (m_nCount - nIndex - 1)*sizeof(long));
 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
           (m_nCount - nIndex - 1)*sizeof(long));


@@ -278,7 +278,7 @@ void wxBaseArray::Remove(long lItem)
   wxCHECK_RET( iIndex != wxNOT_FOUND,
                wxT("removing inexistent item in wxArray::Remove") );
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,
                wxT("removing inexistent item in wxArray::Remove") );
 

-  Remove((size_t)iIndex);
+  RemoveAt((size_t)iIndex);

 }
 
 // sort array elements using passed comparaison function
 }
 
 // sort array elements using passed comparaison function