diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-25 18:24:35 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-28 13:02:46 (GMT) |
| commit | 383da4084ae0cd8dcb9777cbfa90a55c56f7ad09 (patch) | |
| tree | c7eaf2ab79f3583b7b62145be34ab1c28bccb22d /src/corelib/concurrent | |
| parent | 57909eb88ff571fba18459045bd0f8344b32247a (diff) | |
| download | Qt-383da4084ae0cd8dcb9777cbfa90a55c56f7ad09.zip Qt-383da4084ae0cd8dcb9777cbfa90a55c56f7ad09.tar.gz Qt-383da4084ae0cd8dcb9777cbfa90a55c56f7ad09.tar.bz2 | |
QtConcurrent: throw exception from destructor
Task-number: QTBUG-18149
Reviewed-by: Morten Sorvig
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentexception.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp index 948269a..b4123f5 100644 --- a/src/corelib/concurrent/qtconcurrentexception.cpp +++ b/src/corelib/concurrent/qtconcurrentexception.cpp @@ -203,12 +203,7 @@ ExceptionHolder ExceptionStore::exception() void ExceptionStore::throwPossibleException() { - /* On win32-g++, with GCC 3.4.2 std::uncaught_exception() isn't reliable. */ - if (hasException() -#ifndef Q_CC_MINGW - && std::uncaught_exception() == false -#endif - ) { + if (hasException() ) { exceptionHolder.base->hasThrown = true; exceptionHolder.exception()->raise(); } |