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

util/BindMethod: remove unnecessary template arguments from BindMethodWrapperGenerator

Browse Source
This commit is contained in:
Max Kellermann 2021-12-02 23:20:49 +01:00 committed by Max Kellermann
parent bd5f6cbc7b
commit 172c4d9c7d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/BindMethod.hxx
View File

@ -137,28 +137,25 @@ struct MethodWrapperWithSignature<R(Args...) noexcept(NoExcept)> {
/** /**
* Generate a wrapper function. * Generate a wrapper function.
* *
* @param T the containing class
* @param method the method pointer * @param method the method pointer
* @param S the plain function signature type
*/ */
template<typename T, auto method, typename S> template<typename M, auto method>
struct BindMethodWrapperGenerator; struct BindMethodWrapperGenerator;
template<typename T, bool NoExcept, template<typename T, bool NoExcept,
auto method, typename R, typename... Args> auto method, typename R, typename... Args>
struct BindMethodWrapperGenerator<T, method, R(Args...) noexcept(NoExcept)> { struct BindMethodWrapperGenerator<R (T::*)(Args...) noexcept(NoExcept), method> {
static R Invoke(void *_instance, Args... args) noexcept(NoExcept) { static R Invoke(void *_instance, Args... args) noexcept(NoExcept) {
auto &t = *(T *)_instance; auto &t = *(T *)_instance;
return (t.*method)(std::forward<Args>(args)...); return (t.*method)(std::forward<Args>(args)...);
} }
}; };
template<typename T, typename S, template<auto method>
typename MethodWithSignature<T, S>::method_pointer method> typename MethodWrapperWithSignature<typename MethodSignatureHelper<decltype(method)>::plain_signature>::function_pointer
typename MethodWrapperWithSignature<S>::function_pointer
MakeBindMethodWrapper() noexcept MakeBindMethodWrapper() noexcept
{ {
return BindMethodWrapperGenerator<T, method, S>::Invoke; return BindMethodWrapperGenerator<decltype(method), method>::Invoke;
} }
/** /**
@ -222,11 +219,10 @@ constexpr auto
BindMethod(typename BindMethodDetail::MethodSignatureHelper<decltype(method)>::class_type &instance) noexcept BindMethod(typename BindMethodDetail::MethodSignatureHelper<decltype(method)>::class_type &instance) noexcept
{ {
using H = BindMethodDetail::MethodSignatureHelper<decltype(method)>; using H = BindMethodDetail::MethodSignatureHelper<decltype(method)>;
using class_type = typename H::class_type;
using plain_signature = typename H::plain_signature; using plain_signature = typename H::plain_signature;
return BoundMethod<plain_signature>{ return BoundMethod<plain_signature>{
&instance, &instance,
BindMethodDetail::MakeBindMethodWrapper<class_type, plain_signature, method>(), BindMethodDetail::MakeBindMethodWrapper<method>(),
}; };
} }