procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* decl.c (qualify_lookup): Tweak again.

Browse source 
From-SVN: r21266
This commit is contained in:
Jason Merrill 1998-07-17 17:19:31 +00:00 • committed by Jason Merrill
parent c3baf4b55a
commit 6b945830ff
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/cp/ChangeLog
View file

@ -1,5 +1,7 @@
1998-07-17 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (qualify_lookup): Tweak again.
* pt.c (lookup_template_class): Don't mess with the context of the
instantiation.
* decl2.c (current_decl_namespace): Remove special handling for

14
gcc/cp/decl.c
View file

@ -4880,12 +4880,14 @@ qualify_lookup (val, flags)
{
if (val == NULL_TREE)
return val;
if (LOOKUP_NAMESPACES_ONLY (flags) && TREE_CODE (val) != NAMESPACE_DECL)
return NULL_TREE;
if (LOOKUP_TYPES_ONLY (flags) && TREE_CODE (val) != TYPE_DECL
&& ! ((flags & LOOKUP_TEMPLATES_EXPECTED)
&& TREE_CODE (val) == TEMPLATE_DECL
&& DECL_CLASS_TEMPLATE_P (val)))
if ((flags & LOOKUP_PREFER_NAMESPACES) && TREE_CODE (val) == NAMESPACE_DECL)
return val;
if ((flags & LOOKUP_PREFER_TYPES)
&& (TREE_CODE (val) == TYPE_DECL
|| ((flags & LOOKUP_TEMPLATES_EXPECTED)
&& DECL_CLASS_TEMPLATE_P (val))))
return val;
if (flags & (LOOKUP_PREFER_NAMESPACES | LOOKUP_PREFER_TYPES))
return NULL_TREE;
return val;
}