diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/virtual1.C | 7 |
4 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e9040ee..aa9aebf 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/26070 + * decl.c (grokdeclarator): Clear storage_class together with staticp. + 2006-02-07 Gabriel Dos Reis <gdr@integrable-solutions.net> * cp-tree.h (tf_warning_or_error): Renamed from tf_warn_or_error. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 2b82073..7fdb174 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7128,6 +7128,7 @@ grokdeclarator (const cp_declarator *declarator, if (virtualp && staticp == 2) { error ("member %qD cannot be declared both virtual and static", dname); + storage_class = sc_none; staticp = 0; } friendp = !! declspecs->specs[(int)ds_friend]; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1211596..821dc85 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR c++/26070 + * g++.dg/other/virtual1.C: New test. + 2006-02-08 Paolo Bonzini <bonzini@gnu.org> * lib/gcc-dg.exp (cleanup-rtl-dump, cleanup-tree-dump, diff --git a/gcc/testsuite/g++.dg/other/virtual1.C b/gcc/testsuite/g++.dg/other/virtual1.C new file mode 100644 index 0000000..5f44fa7 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/virtual1.C @@ -0,0 +1,7 @@ +// PR c++/26070 +// { dg-do compile } + +struct A +{ + virtual static int i; // { dg-error "virtual" } +}; |