diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1998-10-17 23:10:53 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-10-17 23:10:53 -0400 |
| commit | 52fbc84763ecd3141cdb690d5d61a8750b625c62 (patch) | |
| tree | 8c50557f07c00055f402e99590b4eee708844f77 /gcc/cp/Makefile.in | |
| parent | 176b6042f7fd568dcd1a5a79dac567fe10ae6e4a (diff) | |
| download | gcc-52fbc84763ecd3141cdb690d5d61a8750b625c62.zip gcc-52fbc84763ecd3141cdb690d5d61a8750b625c62.tar.gz gcc-52fbc84763ecd3141cdb690d5d61a8750b625c62.tar.bz2 | |
parse.y (fn.def2): Fix 'attrs' format.
* parse.y (fn.def2): Fix 'attrs' format.
* Makefile.in (CONFLICTS): Update.
* parse.y (expr_or_declarator_intern): New rule.
(expr_or_declarator, direct_notype_declarator, primary,
functional_cast): Use it.
(notype_declarator_intern): New rule.
(notype_declarator, complex_notype_declarator): Use it.
From-SVN: r23159
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 d9e3240..96e8f65 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -219,7 +219,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 25 shift/reduce conflicts and 42 reduce/reduce conflicts. +CONFLICTS = expect 35 shift/reduce conflicts and 42 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) |