From 047e169f3ef990d8373a4b7f7c3cb1b24aed4baa Mon Sep 17 00:00:00 2001
From: Max Kellermann <mk@cm4all.com>
Date: Fri, 3 Dec 2021 08:17:32 +0100
Subject: [PATCH] util/BindMethod: merge MakeBind{Method,Function}Wrapper(),
 they are identical now

---
 src/util/BindMethod.hxx | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/util/BindMethod.hxx b/src/util/BindMethod.hxx
index 544f735c8..6352660d5 100644
--- a/src/util/BindMethod.hxx
+++ b/src/util/BindMethod.hxx
@@ -140,18 +140,11 @@ struct WrapperGenerator<R (*)(Args...) noexcept(NoExcept), function> {
 
 template<auto method>
 typename SignatureHelper<decltype(method)>::function_pointer
-MakeBindMethodWrapper() noexcept
+MakeWrapperFunction() noexcept
 {
 	return WrapperGenerator<decltype(method), method>::Invoke;
 }
 
-template<auto function>
-typename SignatureHelper<decltype(function)>::function_pointer
-MakeBindFunctionWrapper() noexcept
-{
-	return WrapperGenerator<decltype(function), function>::Invoke;
-}
-
 } /* namespace BindMethodDetail */
 
 /**
@@ -168,7 +161,7 @@ BindMethod(typename BindMethodDetail::SignatureHelper<decltype(method)>::class_t
 	using plain_signature = typename H::plain_signature;
 	return BoundMethod<plain_signature>{
 		&instance,
-		BindMethodDetail::MakeBindMethodWrapper<method>(),
+		BindMethodDetail::MakeWrapperFunction<method>(),
 	};
 }
 
@@ -198,7 +191,7 @@ BindFunction() noexcept
 	using plain_signature = typename H::plain_signature;
 	return BoundMethod<plain_signature>{
 		nullptr,
-		BindMethodDetail::MakeBindFunctionWrapper<function>(),
+		BindMethodDetail::MakeWrapperFunction<function>(),
 	};
 }