Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch for Intel compiler.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-03-31 15:43:19 +00:00
parent 587bc95090
commit 76a6e80383
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/mimetype.cpp
View File

@@ -2275,8 +2275,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
// the string is quoted and ends at the matching quote // the string is quoted and ends at the matching quote
pEnd = wxStrchr(++pc, wxT('"')); pEnd = wxStrchr(++pc, wxT('"'));
if ( pEnd == NULL ) { if ( pEnd == NULL ) {
wxLogWarning(_("Mime.types file %s, line %d: unterminated " wxLogWarning(_("Mime.types file %s, line %d: unterminated quoted string."),
"quoted string."),
strFileName.c_str(), nLine + 1); strFileName.c_str(), nLine + 1);
} }
} }
@@ -2552,9 +2551,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
// something is wrong, bail out // something is wrong, bail out
cont = FALSE; cont = FALSE;
wxLogDebug(wxT("Mailcap file %s, line %lu: " wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."),
"'\\' on the end of the last line "
"ignored."),
strFileName.c_str(), strFileName.c_str(),
(unsigned long)nLine + 1); (unsigned long)nLine + 1);
} }
@@ -2618,9 +2615,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
// this might be useful for the programmer // this might be useful for the programmer
wxLogDebug wxLogDebug
( (
wxT("Mailcap file %s, line %lu: " wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."),
"unknown field '%s' for the "
"MIME type '%s' ignored."),
strFileName.c_str(), strFileName.c_str(),
(unsigned long)nLine + 1, (unsigned long)nLine + 1,
curField.c_str(), curField.c_str(),
@@ -2659,8 +2654,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
// check that we really read something reasonable // check that we really read something reasonable
if ( currentToken < Field_Other ) if ( currentToken < Field_Other )
{ {
wxLogWarning(_("Mailcap file %s, line %d: incomplete entry " wxLogWarning(_("Mailcap file %s, line %d: incomplete entry ignored."),
"ignored."),
strFileName.c_str(), nLine + 1); strFileName.c_str(), nLine + 1);
continue; continue;

15
src/unix/threadpsx.cpp
View File

@@ -893,8 +893,7 @@ void wxThreadInternal::Wait()
// wxLogDebug: it is possible to bring the system to its knees // wxLogDebug: it is possible to bring the system to its knees
// by creating too many threads and not joining them quite // by creating too many threads and not joining them quite
// easily // easily
wxLogError(_("Failed to join a thread, potential memory leak " wxLogError(_("Failed to join a thread, potential memory leak detected - please restart the program"));
"detected - please restart the program"));
} }
m_shouldBeJoined = FALSE; m_shouldBeJoined = FALSE;
@@ -1456,8 +1455,7 @@ wxThreadError wxThread::Kill()
void wxThread::Exit(ExitCode status) void wxThread::Exit(ExitCode status)
{ {
wxASSERT_MSG( This() == this, wxASSERT_MSG( This() == this,
_T("wxThread::Exit() can only be called in the " _T("wxThread::Exit() can only be called in the context of the same thread") );
"context of the same thread") );
if ( m_isDetached ) if ( m_isDetached )
{ {
@@ -1496,8 +1494,7 @@ void wxThread::Exit(ExitCode status)
bool wxThread::TestDestroy() bool wxThread::TestDestroy()
{ {
wxASSERT_MSG( This() == this, wxASSERT_MSG( This() == this,
_T("wxThread::TestDestroy() can only be called in the " _T("wxThread::TestDestroy() can only be called in the context of the same thread") );
"context of the same thread") );
m_critsect.Enter(); m_critsect.Enter();
@@ -1530,8 +1527,7 @@ wxThread::~wxThread()
if ( m_internal->GetState() != STATE_EXITED && if ( m_internal->GetState() != STATE_EXITED &&
m_internal->GetState() != STATE_NEW ) m_internal->GetState() != STATE_NEW )
{ {
wxLogDebug(_T("The thread %ld is being destroyed although it is still " wxLogDebug(_T("The thread %ld is being destroyed although it is still running! The application may crash."), GetId());
"running! The application may crash."), GetId());
} }
m_critsect.Leave(); m_critsect.Leave();
@@ -1597,8 +1593,7 @@ bool wxThreadModule::OnInit()
int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */); int rc = pthread_key_create(&gs_keySelf, NULL /* dtor function */);
if ( rc != 0 ) if ( rc != 0 )
{ {
wxLogSysError(rc, _("Thread module initialization failed: " wxLogSysError(rc, _("Thread module initialization failed: failed to create thread key"));
"failed to create thread key"));
return FALSE; return FALSE;
} }