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

Hack around MSVC 6 for forward declarators (from Mike W)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-21 18:59:36 +00:00
parent ba8546912d
commit 0868a03009
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/regex/regextest.cpp
View File

@@ -57,7 +57,8 @@ using CppUnit::TestCase;
using CppUnit::TestSuite; using CppUnit::TestSuite;
using CppUnit::Exception; using CppUnit::Exception;
using namespace std; using std::string;
using std::vector;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// The test case - an instance represents a single test // The test case - an instance represents a single test
@@ -132,7 +133,7 @@ RegExTestCase::RegExTestCase(
m_advanced(false) m_advanced(false)
{ {
bool badconv = m_pattern == convError() || m_data == convError(); bool badconv = m_pattern == convError() || m_data == convError();
vector<const char *>::const_iterator it; std::vector<const char *>::const_iterator it;
for (it = expected.begin(); it != expected.end(); ++it) { for (it = expected.begin(); it != expected.end(); ++it) {
m_expected.push_back(Conv(*it)); m_expected.push_back(Conv(*it));
@@ -157,7 +158,7 @@ int wxWcscmp(const wchar_t* s1, const wchar_t* s2)
if (nLen1 != nLen2) if (nLen1 != nLen2)
return nLen1 - nLen2; return nLen1 - nLen2;
return wxMemcmp(s1, s2, nLen1); return wxTmemcmp(s1, s2, nLen1);
} }
// convert a string from UTF8 to the internal encoding // convert a string from UTF8 to the internal encoding