compilation fixes for some cases

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

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index bc0faa554ee047cb2e2c661efad92e1c68d14aeb..110166bbbab67fb12735da955e7b0384be7dddd8 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -58,9 +58,9 @@
 #   define WXREGEX_USING_BUILTIN
 #   define WXREGEX_IF_NEED_LEN(x) ,x
 #   if wxUSE_UNICODE
 #   define WXREGEX_USING_BUILTIN
 #   define WXREGEX_IF_NEED_LEN(x) ,x
 #   if wxUSE_UNICODE

-#       define WXREGEX_CHAR(x) x.wc_str()
+#       define WXREGEX_CHAR(x) (x).wc_str()

 #   else
 #   else

-#       define WXREGEX_CHAR(x) x.mb_str()
+#       define WXREGEX_CHAR(x) (x).mb_str()

 #   endif
 #else
 #   ifdef HAVE_RE_SEARCH
 #   endif
 #else
 #   ifdef HAVE_RE_SEARCH


@@ -72,7 +72,7 @@
 #   if wxUSE_UNICODE
 #       define WXREGEX_CONVERT_TO_MB
 #   endif
 #   if wxUSE_UNICODE
 #       define WXREGEX_CONVERT_TO_MB
 #   endif

-#   define WXREGEX_CHAR(x) x.mb_str()
+#   define WXREGEX_CHAR(x) (x).mb_str()

 #   define wx_regfree regfree
 #   define wx_regerror regerror
 #endif
 #   define wx_regfree regfree
 #   define wx_regerror regerror
 #endif