summaryrefslogtreecommitdiff
path: root/gcc/cp/Makefile.in
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>1998-07-07 11:25:01 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>1998-07-07 11:25:01 +0000
commitf5edc715b66bfa7c381abff52db053f0466df828 (patch)
treeeca7a2113c77bbfa295d838dbd2ffc640e028da5 /gcc/cp/Makefile.in
parent6875a0481021b4c864460c814ebc967ec346e989 (diff)
downloadgcc-f5edc715b66bfa7c381abff52db053f0466df828.tar.gz
* decl.c (xref_tag): Handle attributes between 'class' and name.
* parse.y (aggr): Likewise. * semantics.c (finish_class_definition): Likewise. * Makefile.in (EXPECTED): Adjust. * cp-tree.h: Declare flag_optional_diags and warn_multichar. * decl2.c: Define them. (lang_decode_option): Handle them. * lang-options.h: Add -foptional-diags. * class.c (finish_struct): Don't complain about multiple meanings of name if -fno-optional-diags. * decl.c (pushdecl_class_level): Likewise. * lex.c (real_yylex): Check warn_multichar. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20994 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/Makefile.in')
-rw-r--r--gcc/cp/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 946e74d5751..b1c28253dee 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -215,7 +215,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 21 shift/reduce conflicts and 42 reduce/reduce conflicts.
+CONFLICTS = expect 22 shift/reduce conflicts and 42 reduce/reduce conflicts.
$(PARSE_H) : $(PARSE_C)
$(PARSE_C) : $(srcdir)/parse.y
@echo $(CONFLICTS)