lalr1.cc: remove useless forward declaration.

	* data/lalr1.cc: Include location.hh before stack.hh.
	Remove the useless forward declarations of position and location.
	Reported by Chris Morley.
	* data/glr.cc: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 760fe9c3acd016fab3de1761931c36d8b438d682..51d9ac5cc406f7363cc28c2dda10efbdbac53433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-13  Akim Demaille  <demaille@gostai.com>
+
+       lalr1.cc: remove useless forward declaration.
+       * data/lalr1.cc: Include location.hh before stack.hh.
+       Remove the useless forward declarations of position and location.
+       Reported by Chris Morley.
+       * data/glr.cc: Likewise.
+

 2010-04-11  Joel E. Denny  <joeldenny@joeldenny.org>
 
        * NEWS (2.4.3): Mention fix for Sun Studio C++.
 2010-04-11  Joel E. Denny  <joeldenny@joeldenny.org>
 
        * NEWS (2.4.3): Mention fix for Sun Studio C++.

diff --git a/data/glr.cc b/data/glr.cc
index 4ebb3d1b77411f47daf870279a6fc7f728cf03dd..feed669a277e547c0fb95a06f120aadfbf89c389 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -226,17 +226,11 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 #include <stdexcept>
 #include <string>
 #include <iostream>
 #include <stdexcept>
 #include <string>
 #include <iostream>

+#include "location.hh"

 
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_if([1], [0])[
 
 
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_if([1], [0])[
 

-]b4_namespace_open[
-  class position;
-  class location;
-]b4_namespace_close[
-
-#include "location.hh"
-

 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG ]b4_parse_trace_if([1], [0])[
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG ]b4_parse_trace_if([1], [0])[

diff --git a/data/lalr1.cc b/data/lalr1.cc
index e4cbf6f7c62f42d378b9f9b3419ed470969b7d61..deab86395e879960a974953da3f1bfa382c67fa2 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -149,16 +149,13 @@ dnl FIXME: This is wrong, we want computed header guards.
 #include <stdexcept>
 #include <string>
 #include <iostream>
 #include <stdexcept>
 #include <string>
 #include <iostream>

+]b4_locations_if([#include "location.hh"])[

 #include "stack.hh"
 
 ]b4_namespace_open[
 #include "stack.hh"
 
 ]b4_namespace_open[

-]b4_locations_if([  class position;
-  class location;])[

 ]b4_variant_if([b4_variant_define])[
 ]b4_namespace_close[
 
 ]b4_variant_if([b4_variant_define])[
 ]b4_namespace_close[
 

-]b4_locations_if([#include "location.hh"])[
-

 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG ]b4_parse_trace_if([1], [0])[
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG ]b4_parse_trace_if([1], [0])[