From 8552680f15eba7e49bf72d9e00fd0c4615e9a07e Mon Sep 17 00:00:00 2001 From: Brendan Kehoe Date: Wed, 17 Sep 1997 18:05:58 +0000 Subject: [PATCH] * Makefile.in (CONFLICTS): Fix s/r conflict count to 18. From-SVN: r15514 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 148691be9c1..185f24b9f6a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +1997-09-17 Brendan Kehoe + + * Makefile.in (CONFLICTS): Fix s/r conflict count to 18. + Tue Sep 16 14:06:56 1997 Jason Merrill * call.c (build_new_op): Give better error for syntactically diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index b68779e8794..5394c263e50 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -201,7 +201,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ `echo $(PARSE_C) | sed 's,^\./,,'` -CONFLICTS = expect 20 shift/reduce conflicts and 39 reduce/reduce conflicts. +CONFLICTS = expect 18 shift/reduce conflicts and 39 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) -- 2.30.2