From: Vadim Zeitlin Date: Thu, 11 Sep 2008 14:00:33 +0000 (+0000) Subject: added braces to suppress g++ 4.3 warnings X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fe26031e268f247d5674d03fead4801411fa48d3 added braces to suppress g++ 4.3 warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp index dc5caa473e..0885346bfe 100644 --- a/tests/archive/archivetest.cpp +++ b/tests/archive/archivetest.cpp @@ -269,10 +269,12 @@ size_t TestInputStream::OnSysRead(void *buffer, size_t size) } if (((m_eoftype & AtLast) != 0 && m_pos >= m_size) || count < size) + { if ((m_eoftype & WithError) != 0) m_lasterror = wxSTREAM_READ_ERROR; else m_lasterror = wxSTREAM_EOF; + } return count; } diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp index bd08950859..042741ed3e 100644 --- a/tests/regex/regextest.cpp +++ b/tests/regex/regextest.cpp @@ -272,19 +272,23 @@ void RegExTestCase::doTest(int flavor) // m - check the match returns the strings given if (m_mode == 'm') + { if (start < INT_MAX) result = m_data.substr(start, len); else result = _T(""); + } // i - check the match returns the offsets given else if (m_mode == 'i') + { if (start > INT_MAX) result = _T("-1 -1"); else if (start + len > 0) result << start << _T(" ") << start + len - 1; else result << start << _T(" -1"); + } msg.clear(); msg << _T("match(") << i << _T(") == ") << quote(result)