diff options
| author | lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-19 14:08:00 +0000 |
|---|---|---|
| committer | lerdsuwa <lerdsuwa@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-19 14:08:00 +0000 |
| commit | 566cd7afbdf568145d9e508d86816bd91593a969 (patch) | |
| tree | d12f6f7ece81be97d1ded812e91f6979f2fe7b6e /gcc/cp/pt.c | |
| parent | f547383e26707a3b4b40983d665ed44487402dd4 (diff) | |
| download | gcc-566cd7afbdf568145d9e508d86816bd91593a969.tar.gz | |
PR c++/495
* pt.c (tsubst_friend_class): Only use innermost template
arguments for the injected friend class template.
* g++.dg/template/friend24.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71574 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 28ed0bcd232..5e5af5b4c48 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5001,6 +5001,8 @@ tsubst_friend_class (tree friend_tmpl, tree args) DECL_USE_TEMPLATE (tmpl) = 0; DECL_TEMPLATE_INFO (tmpl) = NULL_TREE; CLASSTYPE_USE_TEMPLATE (TREE_TYPE (tmpl)) = 0; + CLASSTYPE_TI_ARGS (TREE_TYPE (tmpl)) + = INNERMOST_TEMPLATE_ARGS (CLASSTYPE_TI_ARGS (TREE_TYPE (tmpl))); /* Inject this template into the global scope. */ friend_type = TREE_TYPE (pushdecl_top_level (tmpl)); |