[libsigcplusplus/variadic_mem_fun3: 15/148] deduce_result_type.h: Use this as a regular .h file.

[Murray Cumming <murrayc src gnome org>]

commit 2abf7581b26955ac390735c5e225d4c9fbc35420
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 19:54:02 2016 +0100

    deduce_result_type.h: Use this as a regular .h file.
    
    Instead of generating it from a .h.m4 file.

 sigc++/.gitignore                                  |    1 -
 ...educe_result_type.h.m4 => deduce_result_type.h} |   34 ++++---------------
 sigc++/filelist.am                                 |    5 ++-
 3 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index a706f0a..e5608b7 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -2,7 +2,6 @@
 /signal.h
 /adaptors/bind.h
 /adaptors/compose.h
-/adaptors/deduce_result_type.h
 /adaptors/exception_catch.h
 /adaptors/hide.h
 /adaptors/retype.h
diff --git a/sigc++/adaptors/macros/deduce_result_type.h.m4 b/sigc++/adaptors/deduce_result_type.h
similarity index 64%
rename from sigc++/adaptors/macros/deduce_result_type.h.m4
rename to sigc++/adaptors/deduce_result_type.h
index c7c8fca..35e1a8c 100644
--- a/sigc++/adaptors/macros/deduce_result_type.h.m4
+++ b/sigc++/adaptors/deduce_result_type.h
@@ -1,26 +1,9 @@
-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
+// -*- c++ -*-
+/* Do not edit! -- generated file */
 /*
 */
-_FIREWALL([ADAPTORS_DEDUCE_RESULT_TYPE])
+#ifndef _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_
+#define _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_
 #include <sigc++/functors/functor_trait.h>
 
 namespace sigc {
@@ -45,14 +28,14 @@ struct adaptor_base : public functor_base {};
 
 
 /** Deduce the return type of a functor.
- * <tt>typename deduce_result_type<functor_type, [list of arg_types]>::type</tt>
+ * <tt>typename deduce_result_type<functor_type, list of arg_types>::type</tt>
  * deduces a functor's result type if @p functor_type inherits from
  * sigc::functor_base and defines @p result_type or if @p functor_type
  * is actually a (member) function type. Multi-type functors are not
  * supported.
  *
  * sigc++ adaptors use
- * <tt>typename deduce_result_type<functor_type, [list of arg_types]>::type</tt>
+ * <tt>typename deduce_result_type<functor_type, list of arg_types>::type</tt>
  * to determine the return type of their <tt>templated operator()</tt> overloads.
  *
  * Adaptors in turn define a nested template class @p deduce_result_type
@@ -84,8 +67,5 @@ struct deduce_result_type
 template<typename T_functor, typename... T_args>
 using deduce_result_t = typename deduce_result_type<T_functor, T_args...>::type;
 
-dnl #ifdef SIGC_CXX_TYPEOF
-dnl FOR(0,CALL_SIZE,[[DEDUCE_RESULT_TYPE_TYPEOF(%1,CALL_SIZE)]])
-dnl #endif
-dnl
 } /* namespace sigc */
+#endif /* _SIGC_ADAPTORS_DEDUCE_RESULT_TYPE_H_ */
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index b1d946e..6bd1dbd 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 \
+adaptors_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 \
+adaptors_built_h = bind.h \
                    retype_return.h hide.h retype.h compose.h exception_catch.h \
                    track_obj.h
 
@@ -68,6 +68,7 @@ sigc_public_h =                               \
        adaptors/adaptor_trait.h                \
        adaptors/bind_return.h \
        adaptors/bound_argument.h       \
+       adaptors/deduce_result_type.h \
        functors/functor_trait.h                \
        functors/functors.h             \
        functors/ptr_fun.h              \