aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-01-16 00:04:26 -0500
committerJason Merrill <jason@gcc.gnu.org>2009-01-16 00:04:26 -0500
commit16eba92873ed99eaa5bfb66e7b5f72768ffe503c (patch)
tree6c8e9d04ce3aa687454418d667e63bebbd630f19 /gcc/cp
parentce16861e68383724bf17c15329b22df575601572 (diff)
downloadgcc-16eba92873ed99eaa5bfb66e7b5f72768ffe503c.zip
gcc-16eba92873ed99eaa5bfb66e7b5f72768ffe503c.tar.gz
gcc-16eba92873ed99eaa5bfb66e7b5f72768ffe503c.tar.bz2
re PR c++/38850 (Cannot find inline friend function in template class when called from within a template function)
PR c++/38850 * pt.c (tsubst_copy_and_build): Tell finish_call_expr to accept hidden friends. From-SVN: r143422
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 57ae757..3068674 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-15 Jason Merrill <jason@redhat.com>
+
+ PR c++/38850
+ * pt.c (tsubst_copy_and_build): Tell finish_call_expr to
+ accept hidden friends.
+
2009-01-15 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR C++/29388
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0618fe2..0378d39be1 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11400,9 +11400,12 @@ tsubst_copy_and_build (tree t,
/*fn_p=*/NULL,
complain));
}
+ /* Pass true for koenig_p so that build_new_function_call will
+ allow hidden friends found by arg-dependent lookup at template
+ parsing time. */
return finish_call_expr (function, call_args,
/*disallow_virtual=*/qualified_p,
- koenig_p,
+ /*koenig_p*/true,
complain);
}