From 48eba629250af9c837be249a523ad5a6c909cd7c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 18 Mar 2007 14:29:30 +0000 Subject: [PATCH] compilation fixes after c_str() changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/regex/regextest.cpp | 2 +- tests/streams/largefile.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp index e5a0c89f3d..99afd5d50e 100644 --- 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++) { - wxUChar ch = arg[i]; + wxChar ch = arg[i]; const wxChar *p = wxStrchr(needEscape, ch); if (p) diff --git a/tests/streams/largefile.cpp b/tests/streams/largefile.cpp index 1366ae6091..a47aef8959 100644 --- a/tests/streams/largefile.cpp +++ b/tests/streams/largefile.cpp @@ -337,7 +337,8 @@ void GetVolumeInfo(const wxString& path) } // 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, -- 2.50.0