diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1999-04-15 05:53:55 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1999-04-15 01:53:55 -0400 |
| commit | b607c87f1f37f933244bcdfa6ac83ef1a8ec6fda (patch) | |
| tree | 6bf1dd88d90acc0178c9beb53c6fae9b141e0427 /gcc/cp/Makefile.in | |
| parent | 8856c2d20438edc7427350d5293c35a80e513526 (diff) | |
| download | gcc-b607c87f1f37f933244bcdfa6ac83ef1a8ec6fda.zip gcc-b607c87f1f37f933244bcdfa6ac83ef1a8ec6fda.tar.gz gcc-b607c87f1f37f933244bcdfa6ac83ef1a8ec6fda.tar.bz2 | |
parse.y (after_type_declarator_intern): New nonterminal.
* parse.y (after_type_declarator_intern): New nonterminal.
(after_type_declarator): Use it.
(direct_after_type_declarator): Likewise. Move above
nonnested_type to fix reduce/reduce conflict resolution.
(declmods): Reducing from just 'attributes' has EMPTY precedence.
* Makefile.in (CONFLICTS): Update.
* decl.c (define_label): Downgrade error for jumping over a
non-POD decl to pedwarn.
From-SVN: r26472
Diffstat (limited to 'gcc/cp/Makefile.in')
| -rw-r--r-- | gcc/cp/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 576e97b..d806506 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -225,7 +225,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 36 shift/reduce conflicts and 42 reduce/reduce conflicts. +CONFLICTS = expect 30 shift/reduce conflicts and 42 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) |