[libsigcplusplus/variadic_mem_fun3: 6/148] functor_trait.h.m4: Use a variadic template instead of generating many.

[Murray Cumming <murrayc src gnome org>]

commit 3b7254e680da70402bd5ab25bf4ca2cd5b973d93
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 17:32:41 2016 +0100

    functor_trait.h.m4: Use a variadic template instead of generating many.

 sigc++/functors/macros/functor_trait.h.m4 |   59 +++++++++++++++--------------
 1 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/macros/functor_trait.h.m4
index 743a639..06fb025 100644
--- a/sigc++/functors/macros/functor_trait.h.m4
+++ b/sigc++/functors/macros/functor_trait.h.m4
@@ -17,33 +17,6 @@ dnl
 divert(-1)
 include(template.macros.m4)
 
-define([FUNCTOR_PTR_FUN],[dnl
-template <LIST(LOOP(class T_arg%1, $1), class T_return)>
-struct functor_trait<T_return (*)(LOOP(T_arg%1, $1)), false, false>
-{
-  typedef T_return result_type;
-  typedef pointer_functor<LIST(T_return, LOOP(T_arg%1, $1))> functor_type;
-};
-
-])
-define([FUNCTOR_MEM_FUN],[dnl
-template <LIST(class T_return, class T_obj, class... T_arg)> class mem_functor;
-template <LIST(class T_return, class T_obj, class... T_arg)> class const_mem_functor;
-template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
-struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)), false, false>
-{
-  typedef T_return result_type;
-  typedef mem_functor<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
-};
-template <LIST(LOOP(class T_arg%1, $1), class T_return, class T_obj)>
-struct functor_trait<T_return (T_obj::*)(LOOP(T_arg%1, $1)) const, false, false>
-{
-  typedef T_return result_type;
-  typedef const_mem_functor<LIST(T_return, T_obj, LOOP(T_arg%1, $1))> functor_type;
-};
-
-])
-
 divert(0)dnl
 _FIREWALL([FUNCTORS_FUNCTOR_TRAIT])
 #include <sigc++/type_traits.h>
@@ -273,8 +246,36 @@ struct functor_trait<T_functor, false, true>   \
 template <class T_return, class... T_args>
 class pointer_functor;
 
-FOR(0,CALL_SIZE,[[FUNCTOR_PTR_FUN(%1)]])
-FOR(0,CALL_SIZE,[[FUNCTOR_MEM_FUN(%1)]])
+
+//functor ptr fun:
+
+template <class T_return, class... T_arg>
+struct functor_trait<T_return (*)(T_arg...), false, false>
+{
+  typedef T_return result_type;
+  typedef pointer_functor<T_return, T_arg...> functor_type;
+};
+
+
+//functor mem fun:
+
+template <class T_return, class T_obj, class... T_arg> class mem_functor;
+template <class T_return, class T_obj, class... T_arg> class const_mem_functor;
+
+template <class T_return, class T_obj, class... T_arg>
+struct functor_trait<T_return (T_obj::*)(T_arg...), false, false>
+{
+  typedef T_return result_type;
+  typedef mem_functor<T_return, T_obj, T_arg...> functor_type;
+};
+
+template <class T_return, class T_obj, class... T_arg>
+struct functor_trait<T_return (T_obj::*)(T_arg...) const, false, false>
+{
+  typedef T_return result_type;
+  typedef const_mem_functor<T_return, T_obj, T_arg...> functor_type;
+};
+
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 } /* namespace sigc */