Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / arrimpl.cpp

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index e2f4dee76b5c43826689ab056410fb061b8832ae..0ef9e74890ccff233133817278ca38b5478f24d5 100644 (file)
--- 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 <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWidgets 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<int>(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<int>(ui);                                       \
     }                                                                         \
   }                                                                           \
                                                                               \