Skip to content

R
riscv-gcc-1
Commit 3070ba0b by Jason Merrill Committed by Jason Merrill
Options

* search.c (envelope_add_decl): Tweak for implicit typename. 

From-SVN: r20264
parent e37cda9b
Showing with 9 additions and 4 deletions
gcc/cp/ChangeLog
1998-06-05 Jason Merrill <jason@yorick.cygnus.com> 1998-06-05 Jason Merrill <jason@yorick.cygnus.com>
* search.c (envelope_add_decl): Tweak for implicit typename.
* call.c (joust): Also warn about confusing conversion op/constructor * call.c (joust): Also warn about confusing conversion op/constructor
overload resolution. overload resolution.
......
gcc/cp/search.c
...@@ -3333,6 +3333,12 @@ envelope_add_decl (type, decl, values) ...@@ -3333,6 +3333,12 @@ envelope_add_decl (type, decl, values)
tree name = DECL_NAME (decl); tree name = DECL_NAME (decl);
int dont_add = 0; int dont_add = 0;
/* Yet Another Implicit Typename Kludge: Since we don't tsubst
the members for partial instantiations, DECL_CONTEXT (decl) is wrong.
But pretend it's right for this function. */
if (processing_template_decl)
type = DECL_REAL_CONTEXT (decl);
/* virtual base names are always unique. */ /* virtual base names are always unique. */
if (VBASE_NAME_P (name)) if (VBASE_NAME_P (name))
*values = NULL_TREE; *values = NULL_TREE;
...@@ -3354,10 +3360,7 @@ envelope_add_decl (type, decl, values) ...@@ -3354,10 +3360,7 @@ envelope_add_decl (type, decl, values)
warning ("in this context"); warning ("in this context");
} }
context = (TREE_CODE (value) == FUNCTION_DECL context = DECL_REAL_CONTEXT (value);
&& DECL_VIRTUAL_P (value))
? DECL_CLASS_CONTEXT (value)
: DECL_CONTEXT (value);
if (context == type) if (context == type)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment