[libsigc++2/variadic: 4/6] ptr_fun.h: Use this as a normal header instead of generating it.

[Murray Cumming <murrayc src gnome org>]

commit 204c35e039a25894b4fa32ac2d2256ed2507bf46
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 7 12:00:11 2016 +0100

    ptr_fun.h: Use this as a normal header instead of generating it.

 sigc++/.gitignore                                  |    1 -
 sigc++/filelist.am                                 |    4 +-
 sigc++/functors/{macros/ptr_fun.h.m4 => ptr_fun.h} |   25 ++-----------------
 3 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/sigc++/.gitignore b/sigc++/.gitignore
index 5dc14d7..378febc 100644
--- a/sigc++/.gitignore
+++ b/sigc++/.gitignore
@@ -15,5 +15,4 @@
 /adaptors/lambda/select.h
 /functors/functor_trait.h
 /functors/mem_fun.h
-/functors/ptr_fun.h
 /functors/slot.h
diff --git a/sigc++/filelist.am b/sigc++/filelist.am
index 9663ea8..735051e 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 ptr_fun.h.m4 mem_fun.h.m4
+functors_m4 = functor_trait.h.m4 slot.h.m4 mem_fun.h.m4
 functors_built_cc = 
-functors_built_h = functor_trait.h slot.h ptr_fun.h mem_fun.h
+functors_built_h = functor_trait.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 \
diff --git a/sigc++/functors/macros/ptr_fun.h.m4 b/sigc++/functors/ptr_fun.h
similarity index 74%
rename from sigc++/functors/macros/ptr_fun.h.m4
rename to sigc++/functors/ptr_fun.h
index 7c407a2..9242f29 100644
--- a/sigc++/functors/macros/ptr_fun.h.m4
+++ b/sigc++/functors/ptr_fun.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)
-_FIREWALL([FUNCTORS_PTR_FUN])
+#ifndef _SIGC_FUNCTORS_PTR_FUN_H_
+#define _SIGC_FUNCTORS_PTR_FUN_H_
 #include <sigc++/type_traits.h>
 #include <sigc++/functors/functor_trait.h>
 
@@ -107,3 +87,4 @@ ptr_fun(T_return (*_A_func)(T_args...))
 { return pointer_functor<T_return, T_args...>(_A_func); }
 
 } /* namespace sigc */
+#endif /* _SIGC_FUNCTORS_PTR_FUN_H_ */