lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revert "std::uncaught_exception() -> std::uncaught_exceptions()"

Browse source 
This reverts commit 6b83174fff because
it doesn't work on macOS yet.

https://hydra.nixos.org/build/102617587
This commit is contained in:
Eelco Dolstra 2019-10-04 16:34:59 +02:00
parent 15e70c662e
commit 93b1ce1ac5
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/remote-store.cc
View file

@ -229,7 +229,7 @@ struct ConnectionHandle
~ConnectionHandle() ~ConnectionHandle()
{ {
if (!daemonException && std::uncaught_exceptions()) { if (!daemonException && std::uncaught_exception()) {
handle.markBad(); handle.markBad();
debug("closing daemon connection because of an exception"); debug("closing daemon connection because of an exception");
} }

2
src/libutil/json.hh
View file

@ -170,7 +170,7 @@ public:
~JSONPlaceholder() ~JSONPlaceholder()
{ {
assert(!first || std::uncaught_exceptions()); assert(!first || std::uncaught_exception());
} }
template<typename T> template<typename T>

2
src/libutil/util.cc
View file

@ -1169,7 +1169,7 @@ void _interrupted()
/* Block user interrupts while an exception is being handled. /* Block user interrupts while an exception is being handled.
Throwing an exception while another exception is being handled Throwing an exception while another exception is being handled
kills the program! */ kills the program! */
if (!interruptThrown && !std::uncaught_exceptions()) { if (!interruptThrown && !std::uncaught_exception()) {
interruptThrown = true; interruptThrown = true;
throw Interrupted("interrupted by the user"); throw Interrupted("interrupted by the user");
} }