Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix several mingw32 warnings (patch from Tim Stahlhut)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-02 11:36:35 +00:00
parent b152d8c56c
commit f5851311d3
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/vector.h
View File

@@ -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;