diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-07-04 17:14:35 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-07-04 17:34:57 +0200 |
| commit | ccdc1577ef7fb32a5e30cb655337e7cd42b98987 (patch) | |
| tree | adaa1b54f126c1bd4bb4777b92c3413afc520327 /data/location.cc | |
| parent | ff34897041d26b0a33ab21dbf7089747782a9885 (diff) | |
| parent | faff3bef5b72ac85093799f997596631c3202c12 (diff) | |
| download | bison-ccdc1577ef7fb32a5e30cb655337e7cd42b98987.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
tests: headers.at: strengthen.
glr.cc: do not override C++ definitions by C macros.
YYLLOC_DEFAULT: factor, and don't export it in headers.
api.prefix: do not use #define to handle YYSTYPE_IS_TRIVIAL etc.
tests: portability fixes.
c++: fewer #includes in the headers.
glr.cc: formatting changes.
tests: more logs.
api.prefix: also rename YYDEBUG.
Conflicts:
data/c.m4
data/glr.c
data/glr.cc
data/lalr1.cc
data/yacc.c
Diffstat (limited to 'data/location.cc')
| -rw-r--r-- | data/location.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/location.cc b/data/location.cc index 976fc34b..cfbfd76b 100644 --- a/data/location.cc +++ b/data/location.cc @@ -31,9 +31,9 @@ b4_copyright([Positions for Bison parsers in C++])[ ]b4_cpp_guard_open([b4_dir_prefix[]position.hh])[ -# include <iostream> +# include <algorithm> // std::max +# include <iosfwd> # include <string> -# include <algorithm> ]b4_null_define[ |