OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

class.c (instantiate_type): Don't consider templates for a normal match.

Browse Source 
* class.c (instantiate_type): Don't consider templates for a normal
	match.

From-SVN: r23412
This commit is contained in:
Jason Merrill 1998-10-28 21:02:49 +00:00 committed by Jason Merrill
parent 2455f26fc1
commit e15a4d0dc0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
1998-10-28 Jason Merrill <jason@yorick.cygnus.com>
* class.c (instantiate_type): Don't consider templates for a normal
match.
* class.c (finish_struct_1): Don't complain about non-copy
assignment ops in union members.
@ -10,6 +13,7 @@
(finish_prevtable_vardecl): Lose.
(finish_file): Don't call it.
* pt.c (instantiate_class_template): Likewise.
* cp-tree.h: Remove it.
* init.c (build_delete): Reset TYPE_HAS_DESTRUCTOR here.
* decl.c (finish_function): Not here.

9
gcc/cp/class.c
View File

@ -5140,7 +5140,8 @@ instantiate_type (lhstype, rhs, complain)
else for (elems = rhs; elems; elems = OVL_CHAIN (elems))
{
elem = OVL_FUNCTION (elems);
if (comptypes (lhstype, TREE_TYPE (elem), 1))
if (TREE_CODE (elem) == FUNCTION_DECL
&& comptypes (lhstype, TREE_TYPE (elem), 1))
{
mark_used (elem);
return elem;
@ -5195,7 +5196,8 @@ instantiate_type (lhstype, rhs, complain)
for (elems = rhs; elems; elems = OVL_NEXT (elems))
{
elem = OVL_CURRENT (elems);
if (comp_target_types (lhstype, TREE_TYPE (elem), 1) > 0)
if (TREE_CODE (elem) == FUNCTION_DECL
&& comp_target_types (lhstype, TREE_TYPE (elem), 1) > 0)
break;
}
if (elems)
@ -5205,7 +5207,8 @@ instantiate_type (lhstype, rhs, complain)
elems = OVL_CHAIN (elems))
{
elem = OVL_FUNCTION (elems);
if (comp_target_types (lhstype, TREE_TYPE (elem), 0) > 0)
if (TREE_CODE (elem) == FUNCTION_DECL
&& comp_target_types (lhstype, TREE_TYPE (elem), 0) >0)
break;
}
if (elems)