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

silence warnings about shadowed variables with GCC -Wshadow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-10-04 15:55:06 +00:00
parent f821bc3617
commit 7d1214cd72
18 changed files with 86 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dynarray.cpp
View File

@@ -158,13 +158,13 @@ void name::Grow(size_t nIncrement) \
if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) { \
if( m_nSize == 0 ) { \
/* was empty, determine initial size */ \
size_t size = WX_ARRAY_DEFAULT_INITIAL_SIZE; \
if (size < nIncrement) size = nIncrement; \
size_t sz = WX_ARRAY_DEFAULT_INITIAL_SIZE; \
if (sz < nIncrement) sz = nIncrement; \
/* allocate some memory */ \
m_pItems = new T[size]; \
m_pItems = new T[sz]; \
/* only grow if allocation succeeded */ \
if ( m_pItems ) { \
m_nSize = size; \
m_nSize = sz; \
} \
} \
else \