Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15e70c662e86
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93b1ce1ac522
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 4, 2019

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

    This reverts commit 6b83174 because
it doesn't work on macOS yet.

https://hydra.nixos.org/build/102617587
    @edolstra
    edolstra committed Oct 4, 2019
    Copy the full SHA
    93b1ce1 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/libstore/remote-store.cc
  2. +1 −1 src/libutil/json.hh
  3. +1 −1 src/libutil/util.cc
2 changes: 1 addition & 1 deletion src/libstore/remote-store.cc
View file
Original file line number Diff line number Diff line change
@@ -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");
}
2 changes: 1 addition & 1 deletion src/libutil/json.hh
View file
Original file line number Diff line number Diff line change
@@ -170,7 +170,7 @@ public:

~JSONPlaceholder()
{
assert(!first || std::uncaught_exceptions());
assert(!first || std::uncaught_exception());
}

template<typename T>
2 changes: 1 addition & 1 deletion src/libutil/util.cc
View file
Original file line number Diff line number Diff line change
@@ -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");
}