summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-02-27 15:48:17 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-28 23:43:46 +0100
commit50d3a2917e37cd173f373a83542314002b2ab6c7 (patch)
tree8f686b6790cfe6385a07199c02f156f703729620 /src/corelib/kernel
parentebfd85a499a4382ace09d443b1f35cd6b1848af6 (diff)
Fix Q_GLOBAL_STATIC support for exceptions
The problem was that the HolderBase destructor was getting called after the contained type's constructor threw an exception, as is required by RAII semantics (the base was fully initialized, so it had to be destroyed). That was required because we want to return a non-null pointer from operator() during destruction and return null after destruction, to keep compatibility with Qt 4. The solution is to only set the guard to Destroyed only if it is already at value Initialized. This way, if the HolderBase destructor is run as part of the stack unwinding, it knows that the construction did not complete. Change-Id: I9849b43ed7112bf9e70861b48a56a924c286617e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel')
0 files changed, 0 insertions, 0 deletions