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

util/BindMethod: move SignatureHelper to return type

This commit is contained in:
Max Kellermann 2023-10-02 21:49:39 +02:00 committed by Max Kellermann
parent 7d26cd74c1
commit 5aaa3f50aa
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/BindMethod.hxx
View File

@ -126,12 +126,10 @@ MakeWrapperFunction() noexcept
* @param instance the instance of #T to be bound * @param instance the instance of #T to be bound
*/ */
template<auto method> template<auto method>
constexpr auto constexpr BoundMethod<typename BindMethodDetail::SignatureHelper<decltype(method)>::plain_signature>
BindMethod(typename BindMethodDetail::SignatureHelper<decltype(method)>::class_type &instance) noexcept BindMethod(typename BindMethodDetail::SignatureHelper<decltype(method)>::class_type &instance) noexcept
{ {
using H = BindMethodDetail::SignatureHelper<decltype(method)>; return {
using plain_signature = typename H::plain_signature;
return BoundMethod<plain_signature>{
&instance, &instance,
BindMethodDetail::MakeWrapperFunction<method>(), BindMethodDetail::MakeWrapperFunction<method>(),
}; };
@ -156,12 +154,10 @@ BindMethod(typename BindMethodDetail::SignatureHelper<decltype(method)>::class_t
* @param function the function pointer * @param function the function pointer
*/ */
template<auto function> template<auto function>
constexpr auto constexpr BoundMethod<typename BindMethodDetail::SignatureHelper<decltype(function)>::plain_signature>
BindFunction() noexcept BindFunction() noexcept
{ {
using H = BindMethodDetail::SignatureHelper<decltype(function)>; return {
using plain_signature = typename H::plain_signature;
return BoundMethod<plain_signature>{
nullptr, nullptr,
BindMethodDetail::MakeWrapperFunction<function>(), BindMethodDetail::MakeWrapperFunction<function>(),
}; };