[libsigc++2/variadic] retype_return.h: Use this as a normal .h file.

[Murray Cumming <murrayc src gnome org>]

commit aecd9d7ac760dde6b15009736a12026f222661c6
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 20:09:26 2016 +0100

    retype_return.h: Use this as a normal .h file.
    
    Instead of generating it from a .h.m4 file.

 sigc++/.gitignore                                  |    1 -
 .../{macros/retype_return.h.m4 => retype_return.h} |   29 +++----------------
 sigc++/filelist.am                                 |    5 ++-
 3 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index 941838e..c3c994e 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -4,7 +4,6 @@
 /adaptors/exception_catch.h
 /adaptors/hide.h
 /adaptors/retype.h
-/adaptors/retype_return.h
 /adaptors/track_obj.h
 /adaptors/lambda/base.h
 /adaptors/lambda/lambda.cc
diff --git a/sigc++/adaptors/macros/retype_return.h.m4 b/sigc++/adaptors/retype_return.h
similarity index 82%
rename from sigc++/adaptors/macros/retype_return.h.m4
rename to sigc++/adaptors/retype_return.h
index 72eadc5..ac46a7c 100644
--- a/sigc++/adaptors/macros/retype_return.h.m4
+++ b/sigc++/adaptors/retype_return.h
@@ -1,25 +1,5 @@
-dnl Copyright 2002, 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)
-
-include(template.macros.m4)
-
-divert(0)dnl
-_FIREWALL([ADAPTORS_RETYPE_RETURN])
+#ifndef _SIGC_ADAPTORS_RETYPE_RETURN_H_
+#define _SIGC_ADAPTORS_RETYPE_RETURN_H_
 #include <sigc++/adaptors/adaptor_trait.h>
 
 namespace sigc {
@@ -66,7 +46,7 @@ struct retype_return_functor : public adapts<T_functor>
   /** Constructs a retype_return_functor object that perform a C-style cast on the return value of the 
passed functor.
    * @param _A_functor Functor to invoke from operator()().
    */
-  explicit retype_return_functor(_R_(T_functor) _A_functor)
+  explicit retype_return_functor(type_trait_take_t<T_functor> _A_functor)
     : adapts<T_functor>(_A_functor)
     {}
 };
@@ -113,7 +93,7 @@ struct retype_return_functor<void, T_functor> : public adapts<T_functor>
 
 
   retype_return_functor() {}
-  retype_return_functor(_R_(T_functor) _A_functor)
+  retype_return_functor(type_trait_take_t<T_functor> _A_functor)
     : adapts<T_functor>(_A_functor)
     {}
 };
@@ -168,3 +148,4 @@ hide_return(const T_functor& _A_functor)
   { return retype_return_functor<void, T_functor>(_A_functor); }
 
 } /* namespace sigc */
+#endif /* _SIGC_ADAPTORS_RETYPE_RETURN_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 201083b..1d894a2 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -27,11 +27,11 @@ functors_built_h = slot.h mem_fun.h
 
 # Adaptors (adaptors/)
 adaptors_m4 = bind.h.m4 \
-             retype_return.h.m4 hide.h.m4 retype.h.m4 exception_catch.h.m4 \
+             hide.h.m4 retype.h.m4 exception_catch.h.m4 \
              track_obj.h.m4
 adaptors_built_cc =
 adaptors_built_h = bind.h \
-                   retype_return.h hide.h retype.h exception_catch.h \
+                   hide.h retype.h exception_catch.h \
                    track_obj.h
 
 # Lambda (adaptors/lambda)
@@ -70,6 +70,7 @@ sigc_public_h =                               \
        adaptors/bound_argument.h       \
        adaptors/compose.h \
        adaptors/deduce_result_type.h \
+       adaptors/retype_return.h \
        functors/functor_trait.h                \
        functors/functors.h             \
        functors/ptr_fun.h              \