X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9bf06acdaa4917df9edf4bdceffc8c8639cb362..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/vector.h?ds=sidebyside diff --git a/include/wx/vector.h b/include/wx/vector.h index 3d983aab19..6fc0be174a 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -59,9 +59,12 @@ public: // increase the size twice, unless we're already too big or unless // more is requested - const size_type increment = (m_size > 0) - ? wxMin(m_size, ALLOC_MAX_SIZE) - : ALLOC_INITIAL_SIZE; + // + // NB: casts to size_t are needed to suppress mingw32 warnings about + // mixing enums and ints in the same expression + const size_type increment = m_size > 0 + ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE) + : (size_type)ALLOC_INITIAL_SIZE; if ( m_capacity + increment > n ) n = m_capacity + increment; @@ -170,8 +173,8 @@ public: *(i - count) = *i; // erase items behind the new end of m_values: - for ( iterator i = end() - count; i < end(); ++i ) - *i = value_type(); + for ( iterator j = end() - count; j < end(); ++j ) + *j = value_type(); m_size -= count;