From d19a44bcb53cebbee0ae51981f66b93b31cb9dcb Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 7 Oct 2022 21:38:42 +0200
Subject: a

---
 compat/assert.hpp | 5 ++++-
 compat/defs.hpp   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'compat')

diff --git a/compat/assert.hpp b/compat/assert.hpp
index 6eba9e41..65d7a7fd 100644
--- a/compat/assert.hpp
+++ b/compat/assert.hpp
@@ -24,9 +24,12 @@ template<std::size_t N, typename...Xs>
 [[noreturn]]
 constexpr inline void abort(const char (&fmt)[N], Xs... xs) noexcept
 {
+#if 0
     if (std::is_constant_evaluated())
         throw "aborting";
-    else {
+    else
+#endif
+    {
         emit_debug("fatal: ", fmt, xs...);
         std::abort();
     }
diff --git a/compat/defs.hpp b/compat/defs.hpp
index f4590ca3..36c6a034 100644
--- a/compat/defs.hpp
+++ b/compat/defs.hpp
@@ -8,10 +8,10 @@
 
 #define progn(...) [&]{__VA_ARGS__;}()
 
-#define DECLARE_DEPRECATED_COPY_OPERATOR(type)              \
+#define DECLARE_DEPRECATED_COPY_ASSIGNMENT(type)            \
     [[deprecated]] type(const type&) = default;             \
     [[deprecated]] type& operator=(const type&) = default
 
-#define DECLARE_DELETED_COPY_OPERATOR(type)                 \
+#define DECLARE_DELETED_COPY_ASSIGNMENT(type)               \
     type(const type&) = delete;                             \
     type& operator=(const type&) = delete
-- 
cgit v1.2.3