diff options
| author | lmillward <lmillward@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-11 19:31:33 +0000 |
|---|---|---|
| committer | lmillward <lmillward@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-11 19:31:33 +0000 |
| commit | ceec99b9a6dcd120ed55e7dfc246d5b7e83cf5a3 (patch) | |
| tree | a7b32d64c052d1629ca208252036bb3c64a9f362 /gcc/cp/decl.c | |
| parent | e3625844fba13bd71af4adfd0f326875dc5d36b8 (diff) | |
| download | gcc-ceec99b9a6dcd120ed55e7dfc246d5b7e83cf5a3.tar.gz | |
PR c++/29024
* cp-tree (struct cp_decl_specifier_seq): Rename to
conflicting_specifiers_p
* parser.c (cp_parser_set_storage_class): Set
conflicting_specifiers_p for the input decl specifier
if a typedef specifier is present. Rename uses of
multiple_specifiers_p to conflicting_specifiers_p.
(cp_parser_decl_specifier_seq) <RID_TYPEDEF>: If a storage
class specifier has already been set for this declaration,
set conflicting_specifiers_p to true on the decl_specs.
* decl.c (grokdeclarator): Rename uses of
multiple_specifiers_p to conflicting_specifiers_p.
* g++.dg/parse/typedef8.C: New test.
* g++.dg/other/mult-stor1.C: Adjust error markers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117641 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/decl.c')
| -rw-r--r-- | gcc/cp/decl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 96ecc8691d7..befd4e86485 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7402,9 +7402,9 @@ grokdeclarator (const cp_declarator *declarator, /* Warn about storage classes that are invalid for certain kinds of declarations (parameters, typenames, etc.). */ - if (declspecs->multiple_storage_classes_p) + if (declspecs->conflicting_specifiers_p) { - error ("multiple storage classes in declaration of %qs", name); + error ("conflicting specifiers in declaration of %qs", name); storage_class = sc_none; } else if (thread_p |