oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/IntrusiveList: use const_cast to eliminate duplicate HookTraits functions

Browse Source 
I hate const_cast, but what I hate more is duplicate code.  Sigh.
This commit is contained in:
Max Kellermann
2022-11-12 08:44:54 +01:00
parent 7b3d870516
commit f1dc1af85d
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/IntrusiveList.hxx
View File

@@ -140,18 +140,9 @@ struct IntrusiveListBaseHookTraits {
return static_cast<T *>(hook); return static_cast<T *>(hook);
} }
static constexpr const T *Cast(const IntrusiveListNode *node) noexcept {
const auto *hook = &Hook<T>::Cast(*node);
return static_cast<const T *>(hook);
}
static constexpr auto &ToHook(T &t) noexcept { static constexpr auto &ToHook(T &t) noexcept {
return static_cast<Hook<T> &>(t); return static_cast<Hook<T> &>(t);
} }
static constexpr const auto &ToHook(const T &t) noexcept {
return static_cast<const Hook<T> &>(t);
}
}; };
/** /**
@@ -172,18 +163,9 @@ struct IntrusiveListMemberHookTraits {
return &ContainerCast(hook, member); return &ContainerCast(hook, member);
} }
static constexpr const T *Cast(const IntrusiveListNode *node) noexcept {
const auto &hook = Hook::Cast(*node);
return &ContainerCast(hook, member);
}
static constexpr auto &ToHook(T &t) noexcept { static constexpr auto &ToHook(T &t) noexcept {
return t.*member; return t.*member;
} }
static constexpr const auto &ToHook(const T &t) noexcept {
return t.*member;
}
}; };
/** /**
@@ -207,7 +189,7 @@ class IntrusiveList {
} }
static constexpr const T *Cast(const IntrusiveListNode *node) noexcept { static constexpr const T *Cast(const IntrusiveListNode *node) noexcept {
return HookTraits::Cast(node); return HookTraits::Cast(const_cast<IntrusiveListNode *>(node));
} }
static constexpr auto &ToHook(T &t) noexcept { static constexpr auto &ToHook(T &t) noexcept {