diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-22 15:38:57 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-22 15:38:57 +0000 |
| commit | 5d3935fdb5af9f63de9ac89687fd86c29743dbb9 (patch) | |
| tree | 58452e1e0ff1b6dcd0aae1636db943353fb31f77 /gcc/cp | |
| parent | 5f458d2959a0ab4a3f1f1b4e983f46dd53df8d57 (diff) | |
| download | gcc-5d3935fdb5af9f63de9ac89687fd86c29743dbb9.tar.gz | |
PR c++/70522 - fix N4381 customization points
* name-lookup.c (qualified_lookup_using_namespace): Look through
hidden names.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@235368 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b17e3855cb6..3d4617b1788 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-04-22 Jason Merrill <jason@redhat.com> + + PR c++/70522 + * name-lookup.c (qualified_lookup_using_namespace): Look through + hidden names. + 2016-04-19 Jason Merrill <jason@redhat.com> PR c++/66543 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 89d84d7b1c3..b3828c0956b 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -4647,8 +4647,9 @@ qualified_lookup_using_namespace (tree name, tree scope, cp_binding_level_find_binding_for_name (NAMESPACE_LEVEL (scope), name); if (binding) { - found_here = true; ambiguous_decl (result, binding, flags); + if (result->type || result->value) + found_here = true; } for (usings = DECL_NAMESPACE_USING (scope); usings; |