diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-03-05 11:54:53 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-03-05 11:54:55 +0100 |
| commit | 1cd556ccc5ef023ad42a2dd8abd8aaeaed4f08ff (patch) | |
| tree | f8e7faa5dbaab2bd08656389637708ace39c1fc7 | |
| parent | d69ab061e4fdac1567b2099c905124a261e01245 (diff) | |
| download | sigc++-1cd556ccc5ef023ad42a2dd8abd8aaeaed4f08ff.tar.gz | |
use limit_reference.h as a regular .h file.
Instead of generating it.
| -rw-r--r-- | sigc++/.gitignore | 1 | ||||
| -rw-r--r-- | sigc++/filelist.am | 11 | ||||
| -rw-r--r-- | sigc++/limit_reference.h (renamed from sigc++/macros/limit_reference.h.m4) | 30 |
3 files changed, 9 insertions, 33 deletions
diff --git a/sigc++/.gitignore b/sigc++/.gitignore index e64b803..6069b32 100644 --- a/sigc++/.gitignore +++ b/sigc++/.gitignore @@ -1,2 +1 @@ -/limit_reference.h /functors/mem_fun.h diff --git a/sigc++/filelist.am b/sigc++/filelist.am index 93bd7d1..295a2e3 100644 --- a/sigc++/filelist.am +++ b/sigc++/filelist.am @@ -16,9 +16,7 @@ ## along with this library. If not, see <http://www.gnu.org/licenses/>. # Base (./) -base_m4 = template.macros.m4 limit_reference.h.m4 -base_built_cc = -base_built_h = limit_reference.h +base_m4 = template.macros.m4 # Functors (functors/) functors_m4 = mem_fun.h.m4 @@ -28,15 +26,14 @@ functors_built_h = mem_fun.h # Combine all the above parts with right directories prefixed sigc_m4 = $(base_m4:%=macros/%) \ $(functors_m4:%=functors/macros/%) -sigc_built_cc = $(base_built_cc) \ - $(functors_built_cc:%=functors/%) -sigc_built_h = $(base_built_h) \ - $(functors_built_h:%=functors/%) +sigc_built_cc = $(functors_built_cc:%=functors/%) +sigc_built_h = $(functors_built_h:%=functors/%) sigc_public_h = \ bind.h \ bind_return.h \ connection.h \ + limit_reference.h \ member_method_trait.h \ reference_wrapper.h \ retype_return.h \ diff --git a/sigc++/macros/limit_reference.h.m4 b/sigc++/limit_reference.h index 9fa0de9..ba056b8 100644 --- a/sigc++/macros/limit_reference.h.m4 +++ b/sigc++/limit_reference.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([LIMIT_REFERENCE]) +#ifndef _SIGC_LIMIT_REFERENCE_H_ +#define _SIGC_LIMIT_REFERENCE_H_ #include <sigc++/visit_each.h> #include <sigc++/type_traits.h> @@ -128,8 +107,8 @@ private: }; #ifndef DOXYGEN_SHOULD_SKIP_THIS -/** Implementation of visitor specialized for the [$1]limit_reference - * class, to call visit_each() on the entity returned by the [$1]limit_reference's +/** Implementation of visitor specialized for the $1limit_reference + * class, to call visit_each() on the entity returned by the $1limit_reference's * visit() method. * @tparam T_type The type of the reference * @tparam T_action The type of functor to invoke. @@ -150,3 +129,4 @@ struct visitor<limit_reference<T_type> > } /* namespace sigc */ +#endif /* _SIGC_LIMIT_REFERENCE_H_ */ |