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.

(cherry picked from commit 7799ef159452772946d91aa89213e87729288ef0)

Conflicts:

	data/lalr1.cc.

diff --git a/ChangeLog b/ChangeLog
index 5be24ccf4758fd9da307d98651843a322a7b60e0..f96716b3d7fa674846099530df126347ee269949 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++.

diff --git a/data/glr.cc b/data/glr.cc
index 57b4f1f9077409c3c75a3f82c3004282e8ea243a..068f9a314053f12126fb7884677302c10d3b9800 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -229,17 +229,11 @@ b4_copyright([Skeleton interface for Bison GLR parsers in C++],
 
 #include <string>
 #include <iostream>
+#include "location.hh"
 
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_flag[
 
-]b4_namespace_open[
-  class position;
-  class location;
-]b4_namespace_close[
-
-#include "location.hh"
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG ]b4_debug_flag[

diff --git a/data/lalr1.cc b/data/lalr1.cc
index d56c8b825edb0f1288addec3284d4c0dfd691f60..cd54b6c3e61c8335fe9ed0e4cb698b2b55876ba3 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -46,14 +46,8 @@ dnl FIXME: This is wrong, we want computed header guards.
 
 #include <string>
 #include <iostream>
-#include "stack.hh"
-
-]b4_namespace_open[
-  class position;
-  class location;
-]b4_namespace_close[
-
 #include "location.hh"
+#include "stack.hh"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG