diff options
| author | Jason Merrill <jason@redhat.com> | 2017-03-06 09:44:44 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-03-06 09:44:44 -0500 |
| commit | 90d9a8e6ef72bd85839fb092605aa6d945616178 (patch) | |
| tree | 24a671533c97b963526a66b929f8a952b56080e9 /gcc/cp/search.c | |
| parent | a8d25fd0dd7e0feffc395ff1db1f2e9d815fb78a (diff) | |
| download | gcc-90d9a8e6ef72bd85839fb092605aa6d945616178.zip gcc-90d9a8e6ef72bd85839fb092605aa6d945616178.tar.gz gcc-90d9a8e6ef72bd85839fb092605aa6d945616178.tar.bz2 | |
Revert "Allow deduction guides to look into primary template."
* cp-tree.h, parser.c, pt.c, search.c: Revert.
From-SVN: r245924
Diffstat (limited to 'gcc/cp/search.c')
| -rw-r--r-- | gcc/cp/search.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gcc/cp/search.c b/gcc/cp/search.c index 6eb4124..09c1b4e 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1279,13 +1279,6 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type, if (tree t = currently_open_class (type)) type = t; - /* Declaration of a deduction guide can look inside the primary class - template; replace a compatible type with the real one. */ - if (cxx_dialect >= cxx1z - && scope_chain->deduction_guide_type - && same_type_p (type, scope_chain->deduction_guide_type)) - type = scope_chain->deduction_guide_type; - if (!basetype_path) basetype_path = TYPE_BINFO (type); |