[libsigcplusplus/variadic_mem_fun3: 7/148] functor_trait.h: Use this as a normal header, not generated.

[Murray Cumming <murrayc src gnome org>]

commit 192d9a86cfa5078a85ec64027299c68697d08668
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 17:38:16 2016 +0100

    functor_trait.h: Use this as a normal header, not generated.

 sigc++/.gitignore                                  |    1 -
 sigc++/filelist.am                                 |    5 ++-
 .../{macros/functor_trait.h.m4 => functor_trait.h} |   24 ++-----------------
 3 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index 378febc..911443b 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -13,6 +13,5 @@
 /adaptors/lambda/base.h
 /adaptors/lambda/lambda.cc
 /adaptors/lambda/select.h
-/functors/functor_trait.h
 /functors/mem_fun.h
 /functors/slot.h
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 735051e..6a77588 100644
--- a/sigc++/filelist.am
+++ b/sigc++/filelist.am
@@ -21,9 +21,9 @@ base_built_cc =
 base_built_h = signal.h limit_reference.h
 
 # Functors (functors/)
-functors_m4 = functor_trait.h.m4 slot.h.m4 mem_fun.h.m4
+functors_m4 = slot.h.m4 mem_fun.h.m4
 functors_built_cc = 
-functors_built_h = functor_trait.h slot.h mem_fun.h
+functors_built_h = slot.h mem_fun.h
 
 # Adaptors (adaptors/)
 adaptors_m4 = deduce_result_type.h.m4 adaptor_trait.h.m4 bind.h.m4 bind_return.h.m4 \
@@ -66,5 +66,6 @@ sigc_public_h =                               \
        visit_each.h                    \
        adaptors/adaptors.h             \
        adaptors/bound_argument.h       \
+       functors/functor_trait.h                \
        functors/functors.h             \
        functors/slot_base.h
diff --git a/sigc++/functors/macros/functor_trait.h.m4 b/sigc++/functors/functor_trait.h
similarity index 90%
rename from sigc++/functors/macros/functor_trait.h.m4
rename to sigc++/functors/functor_trait.h
index 06fb025..176a330 100644
--- a/sigc++/functors/macros/functor_trait.h.m4
+++ b/sigc++/functors/functor_trait.h
@@ -1,24 +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([FUNCTORS_FUNCTOR_TRAIT])
+#ifndef _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_
+#define _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_
 #include <sigc++/type_traits.h>
 #include <type_traits>
 
@@ -279,3 +260,4 @@ struct functor_trait<T_return (T_obj::*)(T_arg...) const, false, false>
 #endif // DOXYGEN_SHOULD_SKIP_THIS
 
 } /* namespace sigc */
+#endif /* _SIGC_FUNCTORS_FUNCTOR_TRAIT_H_ */