X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8650108199bf799f21e29811cddaefd579c98c88..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/dynarray.cpp diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 5d99bf67fd..0f556decb5 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -28,6 +28,8 @@ #include #include // for memmove +#if !wxUSE_STD_CONTAINERS + // we cast the value to long from which we cast it to void * in IndexForInsert: // this can't work if the pointers are not big enough wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *), @@ -48,7 +50,7 @@ wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *), // wxBaseArray - dynamic array of 'T's // ---------------------------------------------------------------------------- -#define _WX_DEFINE_BASEARRAY_COMMON(T, name) \ +#define _WX_DEFINE_BASEARRAY(T, name) \ /* searches the array for an item (forward or backwards) */ \ int name::Index(T lItem, bool bFromEnd) const \ { \ @@ -78,41 +80,14 @@ size_t name::Add(T lItem, CMPFUNC fnCompare) \ size_t idx = IndexForInsert(lItem, fnCompare); \ Insert(lItem, idx); \ return idx; \ -} - -#if wxUSE_STL - -#define _WX_DEFINE_BASEARRAY_NOCOMMON(T, name) \ -size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const \ -{ \ - Predicate p((SCMPFUNC)fnCompare); \ - const_iterator it = std::lower_bound(begin(), end(), lItem, p); \ - return it - begin(); \ -} \ - \ -int name::Index(T lItem, CMPFUNC fnCompare) const \ -{ \ - Predicate p((SCMPFUNC)fnCompare); \ - const_iterator it = std::lower_bound(begin(), end(), lItem, p); \ - return (it != end() && !p(lItem, *it)) ? \ - (int)(it - begin()) : wxNOT_FOUND; \ } \ \ -void name::Shrink() \ -{ \ - name tmp(*this); \ - swap(tmp); \ -} - -#else // if !wxUSE_STL - -#define _WX_DEFINE_BASEARRAY_NOCOMMON(T, name) \ /* ctor */ \ name::name() \ { \ m_nSize = \ m_nCount = 0; \ - m_pItems = (T *)NULL; \ + m_pItems = NULL; \ } \ \ /* copy ctor */ \ @@ -132,7 +107,7 @@ name::name(const name& src) \ } \ } \ else \ - m_pItems = (T *) NULL; \ + m_pItems = NULL; \ } \ \ /* assignment operator */ \ @@ -154,7 +129,7 @@ name& name::operator=(const name& src) \ } \ } \ else \ - m_pItems = (T *) NULL; \ + m_pItems = NULL; \ \ return *this; \ } \ @@ -183,13 +158,13 @@ void name::Grow(size_t nIncrement) \ if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) { \ if( m_nSize == 0 ) { \ /* was empty, determine initial size */ \ - size_t size = WX_ARRAY_DEFAULT_INITIAL_SIZE; \ - if (size < nIncrement) size = nIncrement; \ + size_t sz = WX_ARRAY_DEFAULT_INITIAL_SIZE; \ + if (sz < nIncrement) sz = nIncrement; \ /* allocate some memory */ \ - m_pItems = new T[size]; \ + m_pItems = new T[sz]; \ /* only grow if allocation succeeded */ \ if ( m_pItems ) { \ - m_nSize = size; \ + m_nSize = sz; \ } \ } \ else \ @@ -383,6 +358,9 @@ void name::insert(iterator it, const_iterator first, const_iterator last) \ return; \ Grow(nInsert); \ \ + /* old iterator could have been invalidated by Grow(). */ \ + it = begin() + nIndex; \ + \ memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \ (m_nCount - nIndex)*sizeof(T)); \ for (size_t i = 0; i < nInsert; ++i, ++it, ++first) \ @@ -390,12 +368,6 @@ void name::insert(iterator it, const_iterator first, const_iterator last) \ m_nCount += nInsert; \ } -#endif - -#define _WX_DEFINE_BASEARRAY(T, name) \ - _WX_DEFINE_BASEARRAY_COMMON(T, name) \ - _WX_DEFINE_BASEARRAY_NOCOMMON(T, name) - #ifdef __INTELC__ #pragma warning(push) #pragma warning(disable: 1684) @@ -414,15 +386,14 @@ _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) #pragma warning(pop) #endif -#if wxUSE_STL +#else // wxUSE_STD_CONTAINERS + #include "wx/arrstr.h" #include "wx/beforestd.h" #include #include "wx/afterstd.h" -_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase) - // some compilers (Sun CC being the only known example) distinguish between // extern "C" functions and the functions with C++ linkage and ptr_fun and // wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in @@ -507,32 +478,20 @@ void wxArrayString::Sort(bool reverseOrder) } } -int wxSortedArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const +int wxSortedArrayString::Index(const wxString& str, + bool WXUNUSED_UNLESS_DEBUG(bCase), + bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const { - wxSortedArrayString::const_iterator it; + wxASSERT_MSG( bCase && !bFromEnd, + "search parameters ignored for sorted array" ); - if (bCase) - it = std::lower_bound(begin(), end(), str, - wxStringCompare(wxStringCmp())); - else - it = std::lower_bound(begin(), end(), str, - wxStringCompare(wxStringCmpNoCase())); + wxSortedArrayString::const_iterator + it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp())); - if (it == end()) + if ( it == end() || str.Cmp(*it) != 0 ) return wxNOT_FOUND; - if (bCase) - { - if (str.Cmp(*it) != 0) - return wxNOT_FOUND; - } - else - { - if (str.CmpNoCase(*it) != 0) - return wxNOT_FOUND; - } - return it - begin(); } -#endif // wxUSE_STL +#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS