aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/other/mult-stor1.C8
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f8ca474..0aa5d7b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+
+ PR c++/20646
+ * decl.c (grokdeclarator): Reset storage_class after error.
+
2005-08-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR c++/22508
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 99a1830..e2bd165 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7064,7 +7064,10 @@ 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)
- error ("multiple storage classes in declaration of %qs", name);
+ {
+ error ("multiple storage classes in declaration of %qs", name);
+ storage_class = sc_none;
+ }
else if (thread_p
&& ((storage_class
&& storage_class != sc_extern
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ddaeed3..774b0b8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
+
+ PR c++/20646
+ * g++.dg/other/mult-stor1.C: New test.
+
2005-08-09 Andrew Pinski <pinskia@physics.uc.edu>
* gcc.c-torture/pr18299-1.c: Move to ...
diff --git a/gcc/testsuite/g++.dg/other/mult-stor1.C b/gcc/testsuite/g++.dg/other/mult-stor1.C
new file mode 100644
index 0000000..439c0cb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/mult-stor1.C
@@ -0,0 +1,8 @@
+// PR c++/20646
+// Origin: Dan Rosen <dan.rosen@gmail.com>
+// { dg-do compile }
+
+struct A
+{
+ extern static int i; // { dg-error "multiple storage classes" }
+};