compilation fixes after c_str() changes

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

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index e5a0c89f3d504364adf90fa61c1ef504cbb96325..99afd5d50ecb895e5ad793b5d0f91b2f06605bf5 100644 (file)
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -323,7 +323,7 @@ wxString RegExTestCase::quote(const wxString& arg)
     wxString str;
 
     for (size_t i = 0; i < arg.length(); i++) {
     wxString str;
 
     for (size_t i = 0; i < arg.length(); i++) {

-        wxUChar ch = arg[i];
+        wxChar ch = arg[i];

         const wxChar *p = wxStrchr(needEscape, ch);
 
         if (p)
         const wxChar *p = wxStrchr(needEscape, ch);
 
         if (p)

diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp
index 1366ae6091bbbea9683ab4d36bf1184c9e374850..a47aef895925fdb13114612ddeaae8bb275ec26e 100644 (file)
--- a/tests/streams/largefile.cpp
+++ b/tests/streams/largefile.cpp
@@ -337,7 +337,8 @@ void GetVolumeInfo(const wxString& path)
     }
 
     // NULL means the current volume
     }
 
     // NULL means the current volume

-    const wxChar *pVol = vol.empty() ? NULL : vol.c_str();
+    const wxChar *pVol = vol.empty() ? (wxChar *)NULL
+                                     : vol.c_str();

 
     if (!::GetVolumeInformation(pVol, NULL, 0, NULL, NULL,
                                 &volumeFlags, 
 
     if (!::GetVolumeInformation(pVol, NULL, 0, NULL, NULL,
                                 &volumeFlags,