From 93b1ce1ac522ff92626da5cdd689008063935844 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 4 Oct 2019 16:34:59 +0200
Subject: [PATCH] Revert "std::uncaught_exception() ->
 std::uncaught_exceptions()"

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

https://hydra.nixos.org/build/102617587
---
 src/libstore/remote-store.cc | 2 +-
 src/libutil/json.hh          | 2 +-
 src/libutil/util.cc          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index b9e7a80ba..b7f202a6b 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -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");
         }
diff --git a/src/libutil/json.hh b/src/libutil/json.hh
index 45a22f011..02a39917f 100644
--- a/src/libutil/json.hh
+++ b/src/libutil/json.hh
@@ -170,7 +170,7 @@ public:
 
     ~JSONPlaceholder()
     {
-        assert(!first || std::uncaught_exceptions());
+        assert(!first || std::uncaught_exception());
     }
 
     template<typename T>
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index e65f8ee56..1b7449991 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -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");
     }