From e53c6322978d2f8cb8a8aa893c20727aa82cd09c Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 20 Mar 2002 09:35:27 +0000 Subject: [PATCH] * src/conflicts.c (log_resolution): Argument `resolution' is const. --- ChangeLog | 6 +++++- data/bison.c++ | 2 +- src/conflicts.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3537652a..e58db5e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-03-20 Akim Demaille + + * src/conflicts.c (log_resolution): Argument `resolution' is const. + 2002-03-19 Paul Eggert * src/bison.simple (YYCOPY): New macro. @@ -19,7 +23,7 @@ * src/reader.c (parse_union_decl): Define the muscle stype_line. * data/bison.simple, data/bison.c++: Use it. - + 2002-03-19 Akim Demaille * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts) diff --git a/data/bison.c++ b/data/bison.c++ index 87303be9..7537a6cd 100644 --- a/data/bison.c++ +++ b/data/bison.c++ @@ -96,7 +96,7 @@ b4_copyright b4_prologue /* Tokens. */ -b4_token_defines +b4_token_defines(b4_tokens) /* Enabling traces. */ #ifndef YYDEBUG diff --git a/src/conflicts.c b/src/conflicts.c index d90b380a..50669cbf 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -40,7 +40,7 @@ static bitset lookaheadset; static inline void -log_resolution (state_t *state, int LAno, int token, char *resolution) +log_resolution (state_t *state, int LAno, int token, const char *resolution) { if (verbose_flag) obstack_fgrow4 (&output_obstack, -- 2.45.2