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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index d3cb7c62c96d0f99f48165e9f41bb835e8149613..5b890d2d867e460c5d674a3cb9abd674c5c8b2fb 100644 (file)
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -57,7 +57,8 @@ using CppUnit::TestCase;
 using CppUnit::TestSuite;
 using CppUnit::Exception;
 
 using CppUnit::TestSuite;
 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)
 {
     bool badconv = m_pattern == convError() || m_data == convError();
     m_advanced(false)
 {
     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) {
         m_expected.push_back(Conv(*it));
 
     for (it = expected.begin(); it != expected.end(); ++it) {
         m_expected.push_back(Conv(*it));


@@ -157,7 +158,7 @@ int wxWcscmp(const wchar_t* s1, const wchar_t* s2)
     if (nLen1 != nLen2)
         return nLen1 - nLen2;
 
     if (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