From 2fcb8f32f339f3a3cb550f10f565d6072f565012 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 24 Jan 2017 08:10:58 +0200
Subject: Redo config as feature test macros

---
 butl/diagnostics | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'butl/diagnostics')

diff --git a/butl/diagnostics b/butl/diagnostics
index da24c69..694fae7 100644
--- a/butl/diagnostics
+++ b/butl/diagnostics
@@ -8,8 +8,9 @@
 #include <cassert>
 #include <ostream>
 #include <sstream>
-#include <utility>   // move(), forward()
-#include <exception> // uncaught_exception(s)()
+#include <utility>           // move(), forward()
+#include <butl/ft/exception> // uncaught_exceptions
+#include <exception>         // uncaught_exception(s)()
 
 #include <butl/export>
 #include <butl/utility>
@@ -42,7 +43,7 @@ namespace butl
 
     diag_record ()
         :
-#ifdef BUTL_CXX17_UNCAUGHT_EXCEPTIONS
+#ifdef __cpp_lib_uncaught_exceptions
         uncaught_ (std::uncaught_exceptions ()),
 #endif
         empty_ (true),
@@ -94,7 +95,7 @@ namespace butl
 #else
     diag_record (diag_record&& r)
         :
-#ifdef BUTL_CXX17_UNCAUGHT_EXCEPTIONS
+#ifdef __cpp_lib_uncaught_exceptions
         uncaught_ (r.uncaught_),
 #endif
         empty_ (r.empty_),
@@ -115,7 +116,7 @@ namespace butl
     diag_record& operator= (const diag_record&) = delete;
 
   protected:
-#ifdef BUTL_CXX17_UNCAUGHT_EXCEPTIONS
+#ifdef __cpp_lib_uncaught_exceptions
     const int uncaught_;
 #endif
     mutable bool empty_;
-- 
cgit v1.1