fix Sun CC warnings about converting literal strings to non-const char *
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1746,8 +1746,8 @@ wxMBConv_iconv::wxMBConv_iconv(const char *name)
|
|||||||
|
|
||||||
wxLogTrace(TRACE_STRCONV,
|
wxLogTrace(TRACE_STRCONV,
|
||||||
wxT("iconv wchar_t charset is \"%s\"%s"),
|
wxT("iconv wchar_t charset is \"%s\"%s"),
|
||||||
ms_wcCharsetName.empty() ? _T("<none>")
|
ms_wcCharsetName.empty() ? wxString("<none>")
|
||||||
: ms_wcCharsetName.c_str(),
|
: ms_wcCharsetName,
|
||||||
ms_wcNeedsSwap ? _T(" (needs swap)")
|
ms_wcNeedsSwap ? _T(" (needs swap)")
|
||||||
: _T(""));
|
: _T(""));
|
||||||
}
|
}
|
||||||
@@ -1956,7 +1956,7 @@ size_t wxMBConv_iconv::GetMBNulLen() const
|
|||||||
wxMutexLocker lock(self->m_iconvMutex);
|
wxMutexLocker lock(self->m_iconvMutex);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wchar_t *wnul = L"";
|
const wchar_t *wnul = L"";
|
||||||
char buf[8]; // should be enough for NUL in any encoding
|
char buf[8]; // should be enough for NUL in any encoding
|
||||||
size_t inLen = sizeof(wchar_t),
|
size_t inLen = sizeof(wchar_t),
|
||||||
outLen = WXSIZEOF(buf);
|
outLen = WXSIZEOF(buf);
|
||||||
|
Reference in New Issue
Block a user