From d4e889f3c7f9159d4a6089ef115c090e7127e490 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Aug 2008 14:34:23 +0000
Subject: [PATCH] fix a couple of harmless warnings reported by g++ 4.3

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/regex.cpp   | 3 +++
 src/common/strconv.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 0473a1c7c3..4a7241e3b0 100644
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -277,12 +277,15 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
     // translate our flags to regcomp() ones
     int flagsRE = 0;
     if ( !(flags & wxRE_BASIC) )
+    {
 #ifndef WX_NO_REGEX_ADVANCED
         if (flags & wxRE_ADVANCED)
             flagsRE |= REG_ADVANCED;
         else
 #endif
             flagsRE |= REG_EXTENDED;
+    }
+
     if ( flags & wxRE_ICASE )
         flagsRE |= REG_ICASE;
     if ( flags & wxRE_NOSUB )
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 0739b672fd..6dad7a793e 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1959,7 +1959,7 @@ size_t wxMBConv_iconv::GetMBNulLen() const
         wxMutexLocker lock(self->m_iconvMutex);
 #endif
 
-        wchar_t *wnul = L"";
+        const wchar_t *wnul = L"";
         char buf[8]; // should be enough for NUL in any encoding
         size_t inLen = sizeof(wchar_t),
                outLen = WXSIZEOF(buf);