X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a53b9b8fe6fc88f243f777db03bafa3a9651701..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/arrimpl.cpp?ds=sidebyside diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp index d0e3a7f5cd..0ef9e74890 100644 --- a/include/wx/arrimpl.cpp +++ b/include/wx/arrimpl.cpp @@ -4,9 +4,8 @@ // Author: Vadim Zeitlin // Modified by: // Created: 16.10.97 -// RCS-ID: $Id$ // Copyright: (c) 1997 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// /***************************************************************************** @@ -91,14 +90,14 @@ void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \ base_array::operator[](uiIndex + i) = new T(item); \ } \ \ -int name::Index(const T& Item, bool bFromEnd) const \ +int name::Index(const T& item, bool bFromEnd) const \ { \ if ( bFromEnd ) { \ if ( size() > 0 ) { \ size_t ui = size() - 1; \ do { \ - if ( (T*)base_array::operator[](ui) == &Item ) \ - return ui; \ + if ( (T*)base_array::operator[](ui) == &item ) \ + return static_cast(ui); \ ui--; \ } \ while ( ui != 0 ); \ @@ -106,8 +105,8 @@ int name::Index(const T& Item, bool bFromEnd) const \ } \ else { \ for( size_t ui = 0; ui < size(); ui++ ) { \ - if( (T*)base_array::operator[](ui) == &Item ) \ - return ui; \ + if( (T*)base_array::operator[](ui) == &item ) \ + return static_cast(ui); \ } \ } \ \