From 9351d9afcbaae0bdc8aa26f7361be1f84cac7467 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 5 Jan 2022 15:13:24 +0100
Subject: DEFINE_EVENT_TYPEID: fix up deprecation warnings

---
 lib/events/event.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/events/event.h')

diff --git a/lib/events/event.h b/lib/events/event.h
index f12e525e..858972da 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -264,9 +264,9 @@ using Events = EventsArray<Event>;
 // provide matrixTypeId() and typeId().
 #define DEFINE_EVENT_TYPEID(Id_, Type_)                           \
     static constexpr event_type_t TypeId = Id_##_ls;              \
-    [[deprecated("Use _Type::TypeId directly instead")]]          \
+    [[deprecated("Use " #Type_ "::TypeId directly instead")]]     \
     static constexpr event_mtype_t matrixTypeId() { return Id_; } \
-    [[deprecated("Use _Type::TypeId directly instead")]]          \
+    [[deprecated("Use " #Type_ "::TypeId directly instead")]]     \
     static event_type_t typeId() { return TypeId; }               \
     // End of macro
 
-- 
cgit v1.2.3


From bd280a087ecab30f94f7937513ee298c233fcba1 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Tue, 18 Jan 2022 08:54:52 +0100
Subject: Revise inline keyword usage

- Templates and constexpr imply inline
- A function called from a single site better be inlined.
---
 lib/events/event.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/events/event.h')

diff --git a/lib/events/event.h b/lib/events/event.h
index 858972da..f10f6a8d 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -311,7 +311,7 @@ inline auto switchOnType(const BaseEventT& event, FnT&& fn)
 namespace _impl {
     // Using bool instead of auto below because auto apparently upsets MSVC
     template <class BaseT, typename FnT>
-    inline constexpr bool needs_downcast =
+    constexpr bool needs_downcast =
         std::is_base_of_v<BaseT, std::decay_t<fn_arg_t<FnT>>>
         && !std::is_same_v<BaseT, std::decay_t<fn_arg_t<FnT>>>;
 }
-- 
cgit v1.2.3