Merge remote-tracking branch 'origin/maint'

[bison.git] / data / stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index d4f6ef053f12635e3c16e00edf682c54b04cfbfe..cea7b41a80100f3b2486c0deec1a0af19dab8ce6 100644 (file)
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],

-           [2002-2011])
+           [2002-2012])

 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()


@@ -24,10 +24,14 @@ m4_divert_push(0)dnl
 @output(b4_dir_prefix[]stack.hh@)@
 b4_copyright([Stack handling for Bison parsers in C++])[
 
 @output(b4_dir_prefix[]stack.hh@)@
 b4_copyright([Stack handling for Bison parsers in C++])[
 

-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
+/**
+ ** \file ]b4_dir_prefix[stack.hh
+ ** Define the ]b4_namespace_ref[::stack class.
+ */

 
 

-#include <deque>
+]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
+
+# include <deque>

 
 ]b4_namespace_open[
   template <class T, class S = std::deque<T> >
 
 ]b4_namespace_open[
   template <class T, class S = std::deque<T> >


@@ -109,8 +113,8 @@ b4_copyright([Stack handling for Bison parsers in C++])[
   {
   public:
     slice (const S& stack, unsigned int range)
   {
   public:
     slice (const S& stack, unsigned int range)

-      : stack_ (stack),
-        range_ (range)
+      : stack_ (stack)
+      , range_ (range)

     {
     }
 
     {
     }
 


@@ -127,8 +131,7 @@ b4_copyright([Stack handling for Bison parsers in C++])[
   };
 ]b4_namespace_close[
 
   };
 ]b4_namespace_close[
 

-#endif // not BISON_STACK_HH[]dnl
-]
+]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])

 m4_divert_pop(0)
 m4_popdef([b4_copyright_years])dnl
 m4_changecom([#])
 m4_divert_pop(0)
 m4_popdef([b4_copyright_years])dnl
 m4_changecom([#])