mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-29 22:15:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR c++/25666 (Bad diagnostic for templated destructor as friend)

Browse Source 
/cp
2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/25666
	* decl2.c (check_classfn): Check for destructors declared as member
	templates.

/testsuite
2013-05-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/25666
	* g++.dg/parse/dtor16.C: New.
	* g++.dg/parse/dtor6.C: Adjust.

From-SVN: r199324
This commit is contained in:
Paolo Carlini 2013-05-25 08:39:44 +00:00 committed by Paolo Carlini
parent a62e8b4a2a
commit a544998ee3
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/25666
* decl2.c (check_classfn): Check for destructors declared as member
templates.
2013-05-24 Jason Merrill <jason@redhat.com>
PR c++/56971

9
gcc/cp/decl2.c
View File

@ -646,6 +646,15 @@ check_classfn (tree ctype, tree function, tree template_parms)
/* OK, is this a definition of a member template? */
is_template = (template_parms != NULL_TREE);
/* [temp.mem]
A destructor shall not be a member template. */
if (DECL_DESTRUCTOR_P (function) && is_template)
{
error ("destructor %qD declared as member template", function);
return error_mark_node;
}
/* We must enter the scope here, because conversion operators are
named by target type, and type equivalence relies on typenames
resolving within the scope of CTYPE. */

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-25 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/25666
* g++.dg/parse/dtor16.C: New.
* g++.dg/parse/dtor6.C: Adjust.
2013-05-24 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/19618

8
gcc/testsuite/g++.dg/parse/dtor16.C Normal file
View File

@ -0,0 +1,8 @@
// PR c++/25666
struct A { ~A(); };
struct B
{
template<int> friend A::~A(); // { dg-error "member template" }
};

4
gcc/testsuite/g++.dg/parse/dtor6.C
View File

@ -1,8 +1,8 @@
// PR c++/25638
struct A { ~A(); }; // { dg-error "candidate" }
struct A { ~A(); };
struct B : A
{
template<int> friend A::~A(); // { dg-error "match" }
template<int> friend A::~A(); // { dg-error "member template" }
};