aboutsummaryrefslogtreecommitdiff
path: root/butl/utility
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-01-24 08:10:58 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-01-24 08:10:58 +0200
commit2fcb8f32f339f3a3cb550f10f565d6072f565012 (patch)
tree1124a256ba5fe1f66272b781a99374c4c688e3d7 /butl/utility
parentf29c9a5a0cdca0205f98d55ad20d1145295db126 (diff)
Redo config as feature test macros
Diffstat (limited to 'butl/utility')
-rw-r--r--butl/utility18
1 files changed, 10 insertions, 8 deletions
diff --git a/butl/utility b/butl/utility
index ac94171..208a840 100644
--- a/butl/utility
+++ b/butl/utility
@@ -6,15 +6,17 @@
#define BUTL_UTILITY
#include <string>
-#include <iosfwd> // ostream
-#include <cstddef> // size_t
-#include <utility> // move(), forward()
-#include <cstring> // strcmp(), strlen()
-#include <exception> // exception, uncaught_exception(s)()
+#include <iosfwd> // ostream
+#include <cstddef> // size_t
+#include <utility> // move(), forward()
+#include <cstring> // strcmp(), strlen()
+#include <butl/ft/exception> // uncaught_exceptions
+#include <exception> // exception, uncaught_exception(s)()
+#include <butl/ft/lang> // thread_local
+
//#include <functional> // hash
#include <butl/export>
-#include <butl/config>
namespace butl
{
@@ -165,7 +167,7 @@ namespace butl
return exception_guard<F> (std::move (f));
}
-#ifdef BUTL_CXX17_UNCAUGHT_EXCEPTIONS
+#ifdef __cpp_lib_uncaught_exceptions
template <typename F>
struct exception_guard
{
@@ -190,7 +192,7 @@ namespace butl
// part of the exception stack unwindining.
//
extern
-#ifdef BUTL_CXX11_THREAD_LOCAL
+#ifdef __cpp_thread_local
thread_local
#else
__thread