[libsigcplusplus/variadic_mem_fun3: 122/148] mem_fun(): Use base bound_mem_functor_base instead of the aliases.

[Murray Cumming <murrayc src gnome org>]

commit 468a9092cea1e06c0f0e78dc7320b8b7659a169f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 4 15:24:24 2016 +0100

    mem_fun(): Use base bound_mem_functor_base instead of the aliases.
    
    Thus making the bound_mem_functor, bound_const_mem_functor,
    bound_const_volatile_mem_functor, etc, aliases unused.

 sigc++/functors/macros/mem_fun.h.m4 |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/sigc++/functors/macros/mem_fun.h.m4 b/sigc++/functors/macros/mem_fun.h.m4
index 1573135..c4c8f04 100644
--- a/sigc++/functors/macros/mem_fun.h.m4
+++ b/sigc++/functors/macros/mem_fun.h.m4
@@ -85,7 +85,13 @@ define([BOUND_MEM_FUN],[dnl
 template <class T_return, class T_obj, class T_obj2, class... T_arg>
 inline decltype(auto)
 mem_fun(/*$2*/ T_obj* _A_obj, T_return (T_obj2::*_A_func)(T_arg...) $3)
-{ return bound_[$1]mem_functor<T_return, T_obj, T_arg...>(_A_obj, _A_func); }
+{
+  return bound_mem_functor_base<
+    [$1]limit_reference<T_obj>,
+    T_return (T_obj::*)(T_arg...) $3,
+    $2 T_obj,
+    T_return, 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.
  * @param _A_obj Reference to object instance the functor should operate on.
@@ -97,7 +103,13 @@ mem_fun(/*$2*/ T_obj* _A_obj, T_return (T_obj2::*_A_func)(T_arg...) $3)
 template <class T_return, class T_obj, class T_obj2, class... T_arg>
 inline decltype(auto)
 mem_fun(/*$2*/ T_obj& _A_obj, T_return (T_obj2::*_A_func)(T_arg...) $3)
-{ return bound_[$1]mem_functor<T_return, T_obj, T_arg...>(_A_obj, _A_func); }
+{
+  return bound_mem_functor_base<
+    [$1]limit_reference<T_obj>,
+    T_return (T_obj::*)(T_arg...) $3,
+    $2 T_obj,
+    T_return, T_obj, T_arg...>(_A_obj, _A_func);
+}
 
 ])
 
@@ -278,10 +290,12 @@ struct visitor<bound_mem_functor_base<T_func, T_obj_with_modifier, T_return, T_o
 };
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
-BOUND_MEMBER_FUNCTOR([],[],[])
+
+//bound_const_mem_functor is just a convenience aliases used in the
+//definition of make_slot(). TODO: Remove it?
+
 BOUND_MEMBER_FUNCTOR([const_],[const],[const])
-BOUND_MEMBER_FUNCTOR([volatile_],[],[volatile])
-BOUND_MEMBER_FUNCTOR([const_volatile_],[const],[const volatile])
+
 
 MEM_FUN([],[],[])
 MEM_FUN([const_],[const],[const])