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

re PR c++/5658 (Regression on redefinition of a type in a derived class.) 

PR c++/5658
        * search.c (setup_class_bindings): A class template qualifies as a
        type binding.

From-SVN: r52470
This commit is contained in:
Jason Merrill 2002-04-18 09:59:00 -04:00 committed by Jason Merrill
parent 7f91018eb5
commit 04f55fef31
2 changed files with 9 additions and 3 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 @@
2002-04-18 Jason Merrill <jason@redhat.com>
PR c++/5658
* search.c (setup_class_bindings): A class template qualifies as a
type binding.
2002-04-17 Jakub Jelinek <jakub@redhat.com>
PR c++/6316

6
gcc/cp/search.c
View File

@ -1841,7 +1841,7 @@ check_final_overrider (overrider, basefn)
return 0;
}
/* Check throw specifier is subset. */
/* Check throw specifier is at least as strict. */
if (!comp_except_specs (base_throw, over_throw, 0))
{
cp_error_at ("looser throw specifier for `%#F'", overrider);
@ -2392,14 +2392,14 @@ setup_class_bindings (name, type_binding_p)
if (type_binding_p
&& (TREE_CODE (value_binding) == TYPE_DECL
|| DECL_CLASS_TEMPLATE_P (value_binding)
|| (TREE_CODE (value_binding) == TREE_LIST
&& TREE_TYPE (value_binding) == error_mark_node
&& (TREE_CODE (TREE_VALUE (value_binding))
== TYPE_DECL))))
/* We found a type-binding, even when looking for a non-type
binding. This means that we already processed this binding
above. */
my_friendly_assert (type_binding_p, 19990401);
above. */;
else if (value_binding)
{
if (TREE_CODE (value_binding) == TREE_LIST