Embrace variadic templates

[xonotic/netradiant.git] / libs / signal / signal.h

diff --git a/libs/signal/signal.h b/libs/signal/signal.h
index f435f027557d86b94cfab3220a3fb771aa25c75d..3d4c039701b684065ea5b301026c9460890cda9f 100644 (file)
--- a/libs/signal/signal.h
+++ b/libs/signal/signal.h
@@ -315,7 +315,7 @@ class Signal1 : public SignalBase< SignalHandler1<FirstArgument> >
 typedef SignalBase< SignalHandler1<FirstArgument> > Base;
 public:
 void operator()( FirstArgument a1 ) const {
-       invokeSignalHandlers( Base::begin(), Base::end(), Functor1Invoke<typename Base::handler_type>( a1 ) );
+       invokeSignalHandlers( Base::begin(), Base::end(), FunctorInvoke<typename Base::handler_type>( a1 ) );
 }
 };
 
@@ -325,7 +325,7 @@ class Signal2 : public SignalBase< SignalHandler2<FirstArgument, SecondArgument>
 typedef SignalBase< SignalHandler2<FirstArgument, SecondArgument> > Base;
 public:
 void operator()( FirstArgument a1, SecondArgument a2 ) const {
-       invokeSignalHandlers( Base::begin(), Base::end(), Functor2Invoke<typename Base::handler_type>( a1, a2 ) );
+       invokeSignalHandlers( Base::begin(), Base::end(), FunctorInvoke<typename Base::handler_type>( a1, a2 ) );
 }
 };
 
@@ -335,7 +335,7 @@ class Signal3 : public SignalBase< SignalHandler3<FirstArgument, SecondArgument,
 typedef SignalBase< SignalHandler3<FirstArgument, SecondArgument, ThirdArgument> > Base;
 public:
 void operator()( FirstArgument a1, SecondArgument a2, ThirdArgument a3 ) const {
-       invokeSignalHandlers( Base::begin(), Base::end(), Functor3Invoke<typename Base::handler_type>( a1, a2, a3 ) );
+       invokeSignalHandlers( Base::begin(), Base::end(), FunctorInvoke<typename Base::handler_type>( a1, a2, a3 ) );
 }
 };