diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-24 08:10:58 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-24 08:10:58 +0200 |
| commit | 2fcb8f32f339f3a3cb550f10f565d6072f565012 (patch) | |
| tree | 1124a256ba5fe1f66272b781a99374c4c688e3d7 /butl/diagnostics | |
| parent | f29c9a5a0cdca0205f98d55ad20d1145295db126 (diff) | |
Redo config as feature test macros
Diffstat (limited to 'butl/diagnostics')
| -rw-r--r-- | butl/diagnostics | 11 |
1 files changed, 6 insertions, 5 deletions
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_; |