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/unix/fswatcher_inotify.cpp
View File

@@ -268,8 +268,8 @@ protected:
// renames
else if (nativeFlags & IN_MOVE)
{
wxInotifyCookies::iterator it = m_cookies.find(inevt.cookie);
if ( it == m_cookies.end() )
wxInotifyCookies::iterator it2 = m_cookies.find(inevt.cookie);
if ( it2 == m_cookies.end() )
{
int size = sizeof(inevt) + inevt.len;
inotify_event* e = (inotify_event*) operator new (size);
@@ -280,7 +280,7 @@ protected:
}
else
{
inotify_event& oldinevt = *(it->second);
inotify_event& oldinevt = *(it2->second);
wxFileSystemWatcherEvent event(flags);
if ( inevt.mask & IN_MOVED_FROM )
@@ -295,7 +295,7 @@ protected:
}
SendEvent(event);
m_cookies.erase(it);
m_cookies.erase(it2);
delete &oldinevt;
}
}