diff options
| author | Jason Merrill <jason@redhat.com> | 2011-03-17 16:02:08 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2011-03-17 16:02:08 +0000 |
| commit | 27b59ef35fa4e3f16aba15d7f61b51957576f5b3 (patch) | |
| tree | 9166f3143170c60730cad42e36802c6c8ee882a2 /gcc | |
| parent | e3c91b0854bae74dc36664cd8622465eeba8a5d7 (diff) | |
PR c++/48166
* decl.c (revert_static_member_fn): Strip function-cv-quals.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@171103 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/memfnquals1.C | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7248c119e7b..38ac06ce7df 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-17 Jason Merrill <jason@redhat.com> + + PR c++/48166 + * decl.c (revert_static_member_fn): Strip function-cv-quals. + 2011-03-16 Jason Merrill <jason@redhat.com> PR c++/48089 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a7da5742a5e..0985749f32a 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13344,10 +13344,14 @@ static_fn_type (tree memfntype) void revert_static_member_fn (tree decl) { - TREE_TYPE (decl) = static_fn_type (decl); + tree stype = static_fn_type (decl); - if (cp_type_quals (TREE_TYPE (decl)) != TYPE_UNQUALIFIED) - error ("static member function %q#D declared with type qualifiers", decl); + if (type_memfn_quals (stype) != TYPE_UNQUALIFIED) + { + error ("static member function %q#D declared with type qualifiers", decl); + stype = apply_memfn_quals (stype, TYPE_UNQUALIFIED); + } + TREE_TYPE (decl) = stype; if (DECL_ARGUMENTS (decl)) DECL_ARGUMENTS (decl) = DECL_CHAIN (DECL_ARGUMENTS (decl)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 20ba8d6a6a1..47cdbc920e1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-17 Jason Merrill <jason@redhat.com> + + * g++.dg/parse/memfnquals1.C: New. + 2011-03-17 Richard Guenther <rguenther@suse.de> PR middle-end/48134 diff --git a/gcc/testsuite/g++.dg/parse/memfnquals1.C b/gcc/testsuite/g++.dg/parse/memfnquals1.C new file mode 100644 index 00000000000..ce8af7b7273 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/memfnquals1.C @@ -0,0 +1,6 @@ +// PR c++/48166 + +struct foo { + static void func (); +}; +void foo::func () const {} // { dg-error "type qualifiers" } |