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

[Murray Cumming <murrayc src gnome org>]

commit f5fb2dbc6a599b172af195f19bcc7e94ff9bcc04
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 19:51:17 2016 +0100

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

 sigc++/.gitignore                                  |    1 -
 .../{macros/bind_return.h.m4 => bind_return.h}     |   28 +++-----------------
 sigc++/filelist.am                                 |    5 ++-
 3 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index f5a5d8d..a706f0a 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -1,7 +1,6 @@
 /limit_reference.h
 /signal.h
 /adaptors/bind.h
-/adaptors/bind_return.h
 /adaptors/compose.h
 /adaptors/deduce_result_type.h
 /adaptors/exception_catch.h
diff --git a/sigc++/adaptors/macros/bind_return.h.m4 b/sigc++/adaptors/bind_return.h
similarity index 79%
rename from sigc++/adaptors/macros/bind_return.h.m4
rename to sigc++/adaptors/bind_return.h
index 66a0259..8befe88 100644
--- a/sigc++/adaptors/macros/bind_return.h.m4
+++ b/sigc++/adaptors/bind_return.h
@@ -1,26 +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_BIND_RETURN])
+#ifndef _SIGC_ADAPTORS_BIND_RETURN_H_
+#define _SIGC_ADAPTORS_BIND_RETURN_H_
 #include <sigc++/adaptors/adaptor_trait.h>
 #include <sigc++/adaptors/bound_argument.h>
 
@@ -74,7 +53,7 @@ struct bind_return_functor : public adapts<T_functor>
    * @param _A_functor Functor to invoke from operator()().
    * @param _A_ret_value Value to return from operator()().
    */
-  bind_return_functor(_R_(T_functor) _A_functor, _R_(T_return) _A_ret_value)
+  bind_return_functor(type_trait_take_t<T_functor> _A_functor, type_trait_take_t<T_return> _A_ret_value)
     : adapts<T_functor>(_A_functor), ret_value_(_A_ret_value)
     {}
 
@@ -121,3 +100,4 @@ bind_return(const T_functor& _A_functor, T_return _A_ret_value)
 { return bind_return_functor<T_return, T_functor>(_A_functor, _A_ret_value); }
 
 } /* namespace sigc */
+#endif /* _SIGC_ADAPTORS_BIND_RETURN_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 33e8ff3..b1d946e 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -26,11 +26,11 @@ functors_built_cc =
 functors_built_h = slot.h mem_fun.h
 
 # Adaptors (adaptors/)
-adaptors_m4 = deduce_result_type.h.m4 bind.h.m4 bind_return.h.m4 \
+adaptors_m4 = deduce_result_type.h.m4 bind.h.m4 \
              retype_return.h.m4 hide.h.m4 retype.h.m4 compose.h.m4 exception_catch.h.m4 \
              track_obj.h.m4
 adaptors_built_cc =
-adaptors_built_h = deduce_result_type.h bind.h bind_return.h \
+adaptors_built_h = deduce_result_type.h bind.h \
                    retype_return.h hide.h retype.h compose.h exception_catch.h \
                    track_obj.h
 
@@ -66,6 +66,7 @@ sigc_public_h =                               \
        visit_each.h                    \
        adaptors/adaptors.h             \
        adaptors/adaptor_trait.h                \
+       adaptors/bind_return.h \
        adaptors/bound_argument.h       \
        functors/functor_trait.h                \
        functors/functors.h             \