forked from lix-project/lix
Revert "std::uncaught_exception() -> std::uncaught_exceptions()"
This reverts commit 6b83174fff
because
it doesn't work on macOS yet.
https://hydra.nixos.org/build/102617587
This commit is contained in:
parent
15e70c662e
commit
93b1ce1ac5
|
@ -229,7 +229,7 @@ struct ConnectionHandle
|
|||
|
||||
~ConnectionHandle()
|
||||
{
|
||||
if (!daemonException && std::uncaught_exceptions()) {
|
||||
if (!daemonException && std::uncaught_exception()) {
|
||||
handle.markBad();
|
||||
debug("closing daemon connection because of an exception");
|
||||
}
|
||||
|
|
|
@ -170,7 +170,7 @@ public:
|
|||
|
||||
~JSONPlaceholder()
|
||||
{
|
||||
assert(!first || std::uncaught_exceptions());
|
||||
assert(!first || std::uncaught_exception());
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
|
|
|
@ -1169,7 +1169,7 @@ void _interrupted()
|
|||
/* Block user interrupts while an exception is being handled.
|
||||
Throwing an exception while another exception is being handled
|
||||
kills the program! */
|
||||
if (!interruptThrown && !std::uncaught_exceptions()) {
|
||||
if (!interruptThrown && !std::uncaught_exception()) {
|
||||
interruptThrown = true;
|
||||
throw Interrupted("interrupted by the user");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue