Add more possible file name variations of Makefile.in.in

[bison.git] / data / location.cc

diff --git a/data/location.cc b/data/location.cc
index a6b1b35eac4b93b4e708e3e0725be13b70d6873b..a3dacac07409da9f1124133acc246b55832e7582 100644 (file)
--- a/data/location.cc
+++ b/data/location.cc
@@ -2,7 +2,7 @@ m4_divert(-1)
 
 # C++ skeleton for Bison
 
-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 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
@@ -19,21 +19,16 @@ m4_divert(-1)
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 
-m4_include(b4_pkgdatadir/[c++.m4])
-
 # We do want M4 expansion after # for CPP macros.
 m4_changecom()
 m4_divert(0)dnl
 @output b4_dir_prefix[]position.hh
-b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])dnl
-[/* As a special exception, when this parser skeleton is copied by
-   Bison into a Bison output file, you may use that output file
-   without restriction.  This special exception was added by the Free
-   Software Foundation for C++ parsers in version 2.2 of Bison.  */
+b4_copyright([Position class for Bison C++ parsers],
+  [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file position.hh
- ** Define the yy::position class.
+ ** Define the ]b4_namespace[::position class.
  */
 
 #ifndef BISON_POSITION_HH
@@ -42,7 +37,7 @@ b4_copyright([Position class for Bison C++ parsers], [2002, 2003, 2004, 2005])dn
 # include <iostream>
 # include <string>
 
-namespace yy
+namespace ]b4_namespace[
 {
   /// Abstract a position.
   class position
@@ -140,11 +135,12 @@ namespace yy
 }
 #endif // not BISON_POSITION_HH]
 @output b4_dir_prefix[]location.hh
-b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
+b4_copyright([Location class for Bison C++ parsers],
+  [2002, 2003, 2004, 2005, 2006])[
 
 /**
  ** \file location.hh
- ** Define the yy::location class.
+ ** Define the ]b4_namespace[::location class.
  */
 
 #ifndef BISON_LOCATION_HH
@@ -154,7 +150,7 @@ b4_copyright([Location class for Bison C++ parsers], [2002, 2003, 2004, 2005])[
 # include <string>
 # include "position.hh"
 
-namespace yy
+namespace ]b4_namespace[
 {
 
   /// Abstract a location.