From 6b83174ffffbdfc3f876d94d5178e0b83f675cae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 13 Sep 2019 20:05:27 +0200
Subject: [PATCH] std::uncaught_exception() -> std::uncaught_exceptions()

The former is deprecated in C++17. Fixes a clang warning.
---
 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 e38fe49a..89b69941 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -228,7 +228,7 @@ struct ConnectionHandle
 
     ~ConnectionHandle()
     {
-        if (!daemonException && std::uncaught_exception()) {
+        if (!daemonException && std::uncaught_exceptions()) {
             handle.markBad();
             debug("closing daemon connection because of an exception");
         }
diff --git a/src/libutil/json.hh b/src/libutil/json.hh
index 02a39917..45a22f01 100644
--- a/src/libutil/json.hh
+++ b/src/libutil/json.hh
@@ -170,7 +170,7 @@ public:
 
     ~JSONPlaceholder()
     {
-        assert(!first || std::uncaught_exception());
+        assert(!first || std::uncaught_exceptions());
     }
 
     template<typename T>
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 1b744999..e65f8ee5 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_exception()) {
+    if (!interruptThrown && !std::uncaught_exceptions()) {
         interruptThrown = true;
         throw Interrupted("interrupted by the user");
     }