aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2013-12-12 22:58:48 -0500
committerJason Merrill <jason@gcc.gnu.org>2013-12-12 22:58:48 -0500
commit4149642428e2cffdd0ec2c7d14434b2c40b7de21 (patch)
tree3a7c42192e0a6937b868e4b57f13c0b3e54a34ba /gcc/cp/pt.c
parent0bce3228e52e0481b785723d9ba6ff039bdb13de (diff)
downloadgcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.zip
gcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.tar.gz
gcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.tar.bz2
re PR c++/58954 (accessing a private member function in decltype of a friend class causes access control error)
PR c++/58954 * pt.c (resolve_overloaded_unification): Use instantiate_template. From-SVN: r205952
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2c64a71..d566afd 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16407,7 +16407,7 @@ resolve_overloaded_unification (tree tparms,
if (subargs != error_mark_node
&& !any_dependent_template_arguments_p (subargs))
{
- elem = tsubst (TREE_TYPE (fn), subargs, tf_none, NULL_TREE);
+ elem = TREE_TYPE (instantiate_template (fn, subargs, tf_none));
if (try_one_overload (tparms, targs, tempargs, parm,
elem, strict, sub_strict, addr_p, explain_p)
&& (!goodfn || !same_type_p (goodfn, elem)))