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

Don't use try/catch if exceptions support is disabled.

Browse Source 
Closes #15954.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-08 00:43:00 +00:00
parent 10597ecd04
commit 92c74c3513
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/unix/threadpsx.cpp
View File

@@ -870,6 +870,7 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
wxT("Thread %p Entry() returned %lu."), wxT("Thread %p Entry() returned %lu."),
THR_ID(pthread), wxPtrToUInt(pthread->m_exitcode)); THR_ID(pthread), wxPtrToUInt(pthread->m_exitcode));
} }
#ifndef wxNO_EXCEPTIONS
#ifdef HAVE_ABI_FORCEDUNWIND #ifdef HAVE_ABI_FORCEDUNWIND
// When using common C++ ABI under Linux we must always rethrow this // When using common C++ ABI under Linux we must always rethrow this
// special exception used to unwind the stack when the thread was // special exception used to unwind the stack when the thread was
@@ -882,7 +883,11 @@ void *wxThreadInternal::PthreadStart(wxThread *thread)
throw; throw;
} }
#endif // HAVE_ABI_FORCEDUNWIND #endif // HAVE_ABI_FORCEDUNWIND
wxCATCH_ALL( wxTheApp->OnUnhandledException(); ) catch ( ... )
{
wxTheApp->OnUnhandledException();
}
#endif // !wxNO_EXCEPTIONS
{ {
wxCriticalSectionLocker lock(thread->m_critsect); wxCriticalSectionLocker lock(thread->m_critsect);