diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-01-18 19:25:52 +0100 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-01-18 19:25:52 +0100 |
| commit | 142fc5a21f541e2a7592119df075a543527195b9 (patch) | |
| tree | f38cd3f38465a0cf8b38c198b202e624fe939ae1 /lib/events/event.h | |
| parent | ecbff4c1a21ff4c0ab72141bc1a34ae189d33483 (diff) | |
| parent | bf82aeea369cacfc93a0e6d6d9feb01f1f2afdb2 (diff) | |
| download | libquotient-142fc5a21f541e2a7592119df075a543527195b9.tar.gz libquotient-142fc5a21f541e2a7592119df075a543527195b9.zip | |
Merge branch 'kitsune/cleanup2' into dev
Diffstat (limited to 'lib/events/event.h')
| -rw-r--r-- | lib/events/event.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/events/event.h b/lib/events/event.h index f12e525e..f10f6a8d 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 @@ -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>>>; } |