X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ffc8d7a55af1c253ca363bb0fbdda26bb4c9c65..55129143a164e44f832c7438c79310ebe26675d5:/src/common/dynarray.cpp?ds=sidebyside diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 2157246df3..752effe3c2 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -28,6 +28,8 @@ #include #include // for memmove +#if !wxUSE_STL + // 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; \ } \ @@ -390,12 +365,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,30 +383,43 @@ _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) #pragma warning(pop) #endif -#if wxUSE_STL +#else // wxUSE_STL + #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 // this case, we need the wrappers below to make this work -inline int wxStrcmpCppWrapper(const wxChar *p, const wxChar *q) +struct wxStringCmp { - return wxStrcmp(p, q); -} + typedef wxString first_argument_type; + typedef wxString second_argument_type; + typedef int result_type; + + int operator()(const wxString& s1, const wxString& s2) const + { + return s1.compare(s2); + } +}; -inline int wxStricmpCppWrapper(const wxChar *p, const wxChar *q) +struct wxStringCmpNoCase { - return wxStricmp(p, q); -} + typedef wxString first_argument_type; + typedef wxString second_argument_type; + typedef int result_type; -int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const + int operator()(const wxString& s1, const wxString& s2) const + { + return s1.CmpNoCase(s2); + } +}; + +int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const { wxArrayString::const_iterator it; @@ -446,14 +428,14 @@ int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) it = std::find_if(begin(), end(), std::not1( std::bind2nd( - std::ptr_fun(wxStrcmpCppWrapper), sz))); + wxStringCmp(), str))); } else // !bCase { it = std::find_if(begin(), end(), std::not1( std::bind2nd( - std::ptr_fun(wxStricmpCppWrapper), sz))); + wxStringCmpNoCase(), str))); } return it == end() ? wxNOT_FOUND : it - begin(); @@ -464,8 +446,6 @@ class wxStringCompareLess { public: wxStringCompareLess(F f) : m_f(f) { } - bool operator()(const wxChar* s1, const wxChar* s2) - { return m_f(s1, s2) < 0; } bool operator()(const wxString& s1, const wxString& s2) { return m_f(s1, s2) < 0; } private: @@ -495,33 +475,20 @@ void wxArrayString::Sort(bool reverseOrder) } } -int wxSortedArrayString::Index(const wxChar* sz, 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; - wxString s(sz); + wxASSERT_MSG( bCase && !bFromEnd, + "search parameters ignored for sorted array" ); - if (bCase) - it = std::lower_bound(begin(), end(), s, - wxStringCompare(wxStrcmpCppWrapper)); - else - it = std::lower_bound(begin(), end(), s, - wxStringCompare(wxStricmpCppWrapper)); + 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 (wxStrcmp(it->c_str(), sz) != 0) - return wxNOT_FOUND; - } - else - { - if (wxStricmp(it->c_str(), sz) != 0) - return wxNOT_FOUND; - } - return it - begin(); } -#endif +#endif // !wxUSE_STL/wxUSE_STL