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

fix a couple of harmless warnings reported by g++ 4.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-25 14:34:23 +00:00
parent dc0071da65
commit d4e889f3c7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/regex.cpp
View File

@@ -277,12 +277,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// translate our flags to regcomp() ones // translate our flags to regcomp() ones
int flagsRE = 0; int flagsRE = 0;
if ( !(flags & wxRE_BASIC) ) if ( !(flags & wxRE_BASIC) )
{
#ifndef WX_NO_REGEX_ADVANCED #ifndef WX_NO_REGEX_ADVANCED
if (flags & wxRE_ADVANCED) if (flags & wxRE_ADVANCED)
flagsRE |= REG_ADVANCED; flagsRE |= REG_ADVANCED;
else else
#endif #endif
flagsRE |= REG_EXTENDED; flagsRE |= REG_EXTENDED;
}
if ( flags & wxRE_ICASE ) if ( flags & wxRE_ICASE )
flagsRE |= REG_ICASE; flagsRE |= REG_ICASE;
if ( flags & wxRE_NOSUB ) if ( flags & wxRE_NOSUB )

2
src/common/strconv.cpp
View File

@@ -1959,7 +1959,7 @@ size_t wxMBConv_iconv::GetMBNulLen() const
wxMutexLocker lock(self->m_iconvMutex); wxMutexLocker lock(self->m_iconvMutex);
#endif #endif
wchar_t *wnul = L""; const wchar_t *wnul = L"";
char buf[8]; // should be enough for NUL in any encoding char buf[8]; // should be enough for NUL in any encoding
size_t inLen = sizeof(wchar_t), size_t inLen = sizeof(wchar_t),
outLen = WXSIZEOF(buf); outLen = WXSIZEOF(buf);