Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-17 16:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* origin/maint:
  maint: word changes
  lalr1.cc: fix test suite portability
  maint: fix an erroneous include
  tests: check that headers are self contained
  doc: add missing documentation for --report

Conflicts:
	NEWS
	data/location.cc
This commit is contained in:
Akim Demaille
2012-10-04 17:16:00 +02:00
parent fc5618b338 10b009fa50
commit 2b45240d6c
6 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/location.cc
View File

@@ -280,7 +280,7 @@ b4_copyright([Positions for Bison parsers in C++])[
]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[
# include <algorithm> // std::max
# include <iosfwd>
# include <iostream>
# include <string>
]b4_null_define[
@@ -299,8 +299,6 @@ b4_copyright([Locations for Bison parsers in C++])[
]b4_cpp_guard_open([b4_dir_prefix[]location.hh])[
# include <iostream>
# include <string>
# include "position.hh"
]b4_namespace_open[