Applied patch for Intel compiler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2275,8 +2275,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
|
||||
// the string is quoted and ends at the matching quote
|
||||
pEnd = wxStrchr(++pc, wxT('"'));
|
||||
if ( pEnd == NULL ) {
|
||||
wxLogWarning(_("Mime.types file %s, line %d: unterminated "
|
||||
"quoted string."),
|
||||
wxLogWarning(_("Mime.types file %s, line %d: unterminated quoted string."),
|
||||
strFileName.c_str(), nLine + 1);
|
||||
}
|
||||
}
|
||||
@@ -2552,9 +2551,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
|
||||
// something is wrong, bail out
|
||||
cont = FALSE;
|
||||
|
||||
wxLogDebug(wxT("Mailcap file %s, line %lu: "
|
||||
"'\\' on the end of the last line "
|
||||
"ignored."),
|
||||
wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."),
|
||||
strFileName.c_str(),
|
||||
(unsigned long)nLine + 1);
|
||||
}
|
||||
@@ -2618,9 +2615,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
|
||||
// this might be useful for the programmer
|
||||
wxLogDebug
|
||||
(
|
||||
wxT("Mailcap file %s, line %lu: "
|
||||
"unknown field '%s' for the "
|
||||
"MIME type '%s' ignored."),
|
||||
wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."),
|
||||
strFileName.c_str(),
|
||||
(unsigned long)nLine + 1,
|
||||
curField.c_str(),
|
||||
@@ -2659,8 +2654,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
|
||||
// check that we really read something reasonable
|
||||
if ( currentToken < Field_Other )
|
||||
{
|
||||
wxLogWarning(_("Mailcap file %s, line %d: incomplete entry "
|
||||
"ignored."),
|
||||
wxLogWarning(_("Mailcap file %s, line %d: incomplete entry ignored."),
|
||||
strFileName.c_str(), nLine + 1);
|
||||
|
||||
continue;
|
||||
|
Reference in New Issue
Block a user