Callback: work at any arity

[xonotic/netradiant.git] / libs / generic / functional.h

diff --git a/libs/generic/functional.h b/libs/generic/functional.h
index 8843e363b8325fd4c870249941bc5049573e6db9..ecbf6c7d938e285d93169b061a46db4c12fcc755 100644 (file)
--- a/libs/generic/functional.h
+++ b/libs/generic/functional.h
@@ -184,6 +184,8 @@ public:
 template<class Functor>
 using FunctorInvoke = FunctorNInvoke<Functor, get_func<Functor>>;
 
+// todo: inline
+
 template<class Object, class R, R(Object::*member)()>
 using Member = typename MemberN<Object, R()>::template instance<member>;
 
@@ -223,30 +225,4 @@ using Function3 = typename FunctionN<R(A1, A2, A3)>::template instance<func>;
 template<class A1, class A2, class A3, class A4, class R, R(*func)(A1, A2, A3, A4)>
 using Function4 = typename FunctionN<R(A1, A2, A3, A4)>::template instance<func>;
 
-template<class Caller, class FirstArgument = void *>
-using Caller0To1 = CallerShiftFirst<Caller, get_result_type<Caller>(
-        FirstArgument
-)>;
-
-template<class Caller, class FirstArgument = void *>
-using Caller1To2 = CallerShiftFirst<Caller, get_result_type<Caller>(
-        FirstArgument,
-        get_argument<Caller, 0>
-)>;
-
-template<class Caller, class FirstArgument = void *>
-using Caller2To3 = CallerShiftFirst<Caller, get_result_type<Caller>(
-        FirstArgument,
-        get_argument<Caller, 0>,
-        get_argument<Caller, 1>
-)>;
-
-template<class Caller, class FirstArgument = void *>
-using Caller3To4 = CallerShiftFirst<Caller, get_result_type<Caller>(
-        FirstArgument,
-        get_argument<Caller, 0>,
-        get_argument<Caller, 1>,
-        get_argument<Caller, 2>
-)>;
-
 #endif