diff options
| author | Jason Merrill <jason@redhat.com> | 2013-05-13 19:34:02 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2013-05-13 19:34:02 +0000 |
| commit | 25f74815581519b5d8cf04f58ef3e9b9e4b538b5 (patch) | |
| tree | 71b746e363be7b752d029ba71163441755368993 /gcc/cp | |
| parent | 109433b893ef0f153a9eee59c05cee8f873b5f49 (diff) | |
PR c++/57252
* decl.c (decls_match): Compare ref-qualifiers.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@198847 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bf8047fc977..a61af488b1c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2013-05-13 Jason Merrill <jason@redhat.com> + PR c++/57252 + * decl.c (decls_match): Compare ref-qualifiers. + PR c++/57196 * pt.c (convert_template_argument): Use dependent_template_arg_p, not uses_template_parms. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f2b63080505..c8a39e1bfe1 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1027,6 +1027,7 @@ decls_match (tree newdecl, tree olddecl) else types_match = compparms (p1, p2) + && type_memfn_rqual (f1) == type_memfn_rqual (f2) && (TYPE_ATTRIBUTES (TREE_TYPE (newdecl)) == NULL_TREE || comp_type_attributes (TREE_TYPE (newdecl), TREE_TYPE (olddecl)) != 0); |