[libsigc++2/variadic_mem_fun2] bound_mem_functor_base: Remove now-unused T_return template parameter.



commit 3d71489bae350dba5ca8007c05fafcaf37e4efe3
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Mar 5 23:04:41 2016 +0100

    bound_mem_functor_base: Remove now-unused T_return template parameter.

 sigc++/adaptors/retype.h            |    6 +++---
 sigc++/functors/macros/mem_fun.h.m4 |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/sigc++/adaptors/retype.h b/sigc++/adaptors/retype.h
index c9025e2..f3c4785 100644
--- a/sigc++/adaptors/retype.h
+++ b/sigc++/adaptors/retype.h
@@ -154,10 +154,10 @@ retype(const mem_functor_base<T_func, T_obj, T_arg...>& _A_functor)
  */
 template <
   class T_func,
-  class T_return, class T_obj, class... T_arg>
+  class T_obj, class... T_arg>
 inline decltype(auto)
-retype(const bound_mem_functor_base<T_func, T_return, T_obj, T_arg...>& _A_functor)
-{ return retype_functor<bound_mem_functor_base<T_func, T_return, T_obj, T_arg...>, T_arg...>
+retype(const bound_mem_functor_base<T_func, T_obj, T_arg...>& _A_functor)
+{ return retype_functor<bound_mem_functor_base<T_func, T_obj, T_arg...>, T_arg...>
     (_A_functor);
 }
 
diff --git a/sigc++/functors/macros/mem_fun.h.m4 b/sigc++/functors/macros/mem_fun.h.m4
index ede3215..1b2fb36 100644
--- a/sigc++/functors/macros/mem_fun.h.m4
+++ b/sigc++/functors/macros/mem_fun.h.m4
@@ -52,7 +52,7 @@ template<class T_return, class T_obj, class... T_arg>
 using bound_[$1]mem_functor =
   bound_mem_functor_base<
     T_return (T_obj::*)(T_arg...) $2,
-    T_return, T_obj, T_arg...>;
+    T_obj, T_arg...>;
 ])
 
 define([MEM_FUN],[dnl
@@ -84,7 +84,7 @@ mem_fun(/*$2*/ T_obj* _A_obj, T_return (T_obj2::*_A_func)(T_arg...) $3)
 {
   return bound_mem_functor_base<
     T_return (T_obj::*)(T_arg...) $3,
-    T_return, T_obj, T_arg...>(_A_obj, _A_func);
+    T_obj, T_arg...>(_A_obj, _A_func);
 }
 
 /** Creates a functor of type sigc::bound_[$1]mem_functor which encapsulates a method and an object instance.
@@ -100,7 +100,7 @@ mem_fun(/*$2*/ T_obj& _A_obj, T_return (T_obj2::*_A_func)(T_arg...) $3)
 {
   return bound_mem_functor_base<
     T_return (T_obj::*)(T_arg...) $3,
-    T_return, T_obj, T_arg...>(_A_obj, _A_func);
+    T_obj, T_arg...>(_A_obj, _A_func);
 }
 
 ])
@@ -215,7 +215,7 @@ MEMBER_FUNCTOR([],[])
 MEMBER_FUNCTOR([const_],[const])
 
 template <class T_func,
-  class T_return, class T_obj, class... T_arg>
+  class T_obj, class... T_arg>
 class bound_mem_functor_base
 : mem_functor_base<T_func, T_obj, T_arg...>
 {
@@ -271,12 +271,12 @@ public:
  *
  * @ingroup mem_fun
  */
-template <class T_func, class T_return, class T_obj, class... T_arg>
-struct visitor<bound_mem_functor_base<T_func, T_return, T_obj, T_arg...> >
+template <class T_func, class T_obj, class... T_arg>
+struct visitor<bound_mem_functor_base<T_func, T_obj, T_arg...> >
 {
   template <class T_action>
   static void do_visit_each(const T_action& _A_action,
-                            const bound_mem_functor_base<T_func, T_return, T_obj, T_arg...>& _A_target)
+                            const bound_mem_functor_base<T_func, T_obj, T_arg...>& _A_target)
   {
     sigc::visit_each(_A_action, _A_target.obj_);
   }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]