[libsigcplusplus/variadic_mem_fun3: 17/148] compose.h: Use this as a normal .h file.

[Murray Cumming <murrayc src gnome org>]

commit 2c6383f629dd92392ba1c762b69b482de24fb6d9
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 20:02:32 2016 +0100

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

 sigc++/.gitignore                                  |    1 -
 sigc++/adaptors/{macros/compose.h.m4 => compose.h} |   26 ++-----------------
 sigc++/filelist.am                                 |    5 ++-
 3 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index e5608b7..941838e 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -1,7 +1,6 @@
 /limit_reference.h
 /signal.h
 /adaptors/bind.h
-/adaptors/compose.h
 /adaptors/exception_catch.h
 /adaptors/hide.h
 /adaptors/retype.h
diff --git a/sigc++/adaptors/macros/compose.h.m4 b/sigc++/adaptors/compose.h
similarity index 89%
rename from sigc++/adaptors/macros/compose.h.m4
rename to sigc++/adaptors/compose.h
index cbdf3f8..667d734 100644
--- a/sigc++/adaptors/macros/compose.h.m4
+++ b/sigc++/adaptors/compose.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)
-_FIREWALL([ADAPTORS_COMPOSE])
+#ifndef _SIGC_ADAPTORS_COMPOSE_H_
+#define _SIGC_ADAPTORS_COMPOSE_H_
 #include <sigc++/adaptors/adaptor_trait.h>
 
 namespace sigc {
@@ -229,3 +208,4 @@ compose(const T_setter& _A_setter, const T_getter1& _A_getter1, const T_getter2&
   { return compose2_functor<T_setter, T_getter1, T_getter2>(_A_setter, _A_getter1, _A_getter2); }
 
 } /* namespace sigc */
+#endif /* _SIGC_ADAPTORS_COMPOSE_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 6bd1dbd..201083b 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 compose.h.m4 exception_catch.h.m4 \
+             retype_return.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 compose.h exception_catch.h \
+                   retype_return.h hide.h retype.h exception_catch.h \
                    track_obj.h
 
 # Lambda (adaptors/lambda)
@@ -68,6 +68,7 @@ sigc_public_h =                               \
        adaptors/adaptor_trait.h                \
        adaptors/bind_return.h \
        adaptors/bound_argument.h       \
+       adaptors/compose.h \
        adaptors/deduce_result_type.h \
        functors/functor_trait.h                \
        functors/functors.h             \