From 26dc37bd7685351fd24fcaec0f83d9b5a8ee0f06 Mon Sep 17 00:00:00 2001
From: Max Kellermann <mk@cm4all.com>
Date: Fri, 3 Dec 2021 08:06:57 +0100
Subject: [PATCH] util/BindMethod: merge structs
 {Method,Function}WrapperGenerator into one

---
 src/util/BindMethod.hxx | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/util/BindMethod.hxx b/src/util/BindMethod.hxx
index 2f2ca18a5..12fa7356a 100644
--- a/src/util/BindMethod.hxx
+++ b/src/util/BindMethod.hxx
@@ -124,48 +124,39 @@ struct FunctionSignatureHelper<R (*)(Args...) noexcept(NoExcept)> {
 /**
  * Generate a wrapper function.
  *
- * @param method the method pointer
+ * @param method the method/function pointer
  */
 template<typename M, auto method>
-struct BindMethodWrapperGenerator;
+struct WrapperGenerator;
 
 template<typename T, bool NoExcept,
 	 auto method, typename R, typename... Args>
-struct BindMethodWrapperGenerator<R (T::*)(Args...) noexcept(NoExcept), method> {
+struct WrapperGenerator<R (T::*)(Args...) noexcept(NoExcept), method> {
 	static R Invoke(void *_instance, Args... args) noexcept(NoExcept) {
 		auto &t = *(T *)_instance;
 		return (t.*method)(std::forward<Args>(args)...);
 	}
 };
 
+template<auto function, bool NoExcept, typename R, typename... Args>
+struct WrapperGenerator<R (*)(Args...) noexcept(NoExcept), function> {
+	static R Invoke(void *, Args... args) noexcept(NoExcept) {
+		return function(std::forward<Args>(args)...);
+	}
+};
+
 template<auto method>
 typename MethodSignatureHelper<decltype(method)>::function_pointer
 MakeBindMethodWrapper() noexcept
 {
-	return BindMethodWrapperGenerator<decltype(method), method>::Invoke;
+	return WrapperGenerator<decltype(method), method>::Invoke;
 }
 
-/**
- * Generate a wrapper function.
- *
- * @param F the function pointer type
- * @param function the function pointer
- */
-template<typename F, auto function>
-struct BindFunctionWrapperGenerator;
-
-template<auto function, bool NoExcept, typename R, typename... Args>
-struct BindFunctionWrapperGenerator<R (*)(Args...) noexcept(NoExcept), function> {
-	static R Invoke(void *, Args... args) noexcept(NoExcept) {
-		return function(std::forward<Args>(args)...);
-	}
-};
-
 template<auto function>
 typename FunctionSignatureHelper<decltype(function)>::function_pointer
 MakeBindFunctionWrapper() noexcept
 {
-	return BindFunctionWrapperGenerator<decltype(function), function>::Invoke;
+	return WrapperGenerator<decltype(function), function>::Invoke;
 }
 
 } /* namespace BindMethodDetail */