[libsigcplusplus/variadic_mem_fun3: 118/148] Use retype.h as a normal .h file.

[Murray Cumming <murrayc src gnome org>]

commit 6f36a747cbed98703b97962cdabc14b633119259
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 4 14:10:01 2016 +0100

    Use retype.h as a normal .h file.
    
    Instead of generating it.

 sigc++/.gitignore                                |    1 -
 sigc++/adaptors/{macros/retype.h.m4 => retype.h} |   28 ++++------------------
 sigc++/filelist.am                               |   15 +++--------
 3 files changed, 9 insertions(+), 35 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index d8c2879..e64b803 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -1,3 +1,2 @@
 /limit_reference.h
-/adaptors/retype.h
 /functors/mem_fun.h
diff --git a/sigc++/adaptors/macros/retype.h.m4 b/sigc++/adaptors/retype.h
similarity index 86%
rename from sigc++/adaptors/macros/retype.h.m4
rename to sigc++/adaptors/retype.h
index 07b1f09..4a89969 100644
--- a/sigc++/adaptors/macros/retype.h.m4
+++ b/sigc++/adaptors/retype.h
@@ -1,25 +1,6 @@
-dnl Copyright 2003, The libsigc++ Development Team
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-divert(-1)
+#ifndef _SIGC_ADAPTORS_RETYPE_H_
+#define _SIGC_ADAPTORS_RETYPE_H_
 
-include(template.macros.m4)
-
-divert(0)dnl
-_FIREWALL([ADAPTORS_RETYPE])
 #include <sigc++/adaptors/adaptor_trait.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/functors/mem_fun.h>
@@ -83,7 +64,7 @@ struct retype_functor
   using adaptor_type = typename adapts<T_functor>::adaptor_type;
   using result_type = typename adapts<T_functor>::result_type;
 
- template <class... T_arg>
+  template <class... T_arg>
   decltype(auto)
   operator()(T_arg... _A_a)
     { return this->functor_.template operator()<type_trait_take_t<T_type>...>
@@ -126,7 +107,7 @@ struct visitor<retype_functor<T_functor, T_type...> >
  *
  * @ingroup retype
  */
-template <LIST(class T_return, class... T_arg)>
+template <class T_return, class... T_arg>
 inline decltype(auto)
 retype(const slot<T_return, T_arg...>& _A_functor)
 { return retype_functor<slot<T_return, T_arg...>, T_arg...>
@@ -182,3 +163,4 @@ retype(const bound_mem_functor_base<T_limit_reference, T_func, T_obj_with_modifi
 
 } /* namespace sigc */
 
+#endif /* _SIGC_ADAPTORS_RETYPE_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 31f9916..2aa8707 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -25,21 +25,13 @@ functors_m4 = mem_fun.h.m4
 functors_built_cc = 
 functors_built_h = mem_fun.h
 
-# Adaptors (adaptors/)
-adaptors_m4 = retype.h.m4
-adaptors_built_cc =
-adaptors_built_h = retype.h
-
 # Combine all the above parts with right directories prefixed
 sigc_m4 = $(base_m4:%=macros/%) \
-         $(functors_m4:%=functors/macros/%) \
-          $(adaptors_m4:%=adaptors/macros/%)
+         $(functors_m4:%=functors/macros/%)
 sigc_built_cc = $(base_built_cc) \
-         $(functors_built_cc:%=functors/%) \
-          $(adaptors_built_cc:%=adaptors/%)
+         $(functors_built_cc:%=functors/%)
 sigc_built_h = $(base_built_h) \
-         $(functors_built_h:%=functors/%) \
-          $(adaptors_built_h:%=adaptors/%)
+         $(functors_built_h:%=functors/%)
 
 sigc_public_h =                                \
        bind.h                          \
@@ -68,6 +60,7 @@ sigc_public_h =                               \
        adaptors/compose.h \
        adaptors/exception_catch.h \
        adaptors/hide.h \
+       adaptors/retype.h \
        adaptors/track_obj.h \
        adaptors/retype_return.h \
        functors/functor_base.h \