diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-18 14:36:48 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-18 14:36:48 +0000 |
| commit | b893667c0aa51317cfc25c965bf248ec84bc0107 (patch) | |
| tree | 4390aadde644decfb75fbbfbd4f646dda2c72d16 /gcc/cp/pt.c | |
| parent | 1269ac1c72c5d1b4038a34a6fa5387ed6f938181 (diff) | |
| download | gcc-b893667c0aa51317cfc25c965bf248ec84bc0107.tar.gz | |
* pt.c (instantiate_template_1): Use tsubst_aggr_type for context.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217716 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c0f3b8c5f9f..6661325aa49 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15856,8 +15856,8 @@ instantiate_template_1 (tree tmpl, tree orig_args, tsubst_flags_t complain) ++processing_template_decl; if (DECL_CLASS_SCOPE_P (gen_tmpl)) { - tree ctx = tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr, - complain, gen_tmpl); + tree ctx = tsubst_aggr_type (DECL_CONTEXT (gen_tmpl), targ_ptr, + complain, gen_tmpl, true); push_nested_class (ctx); } /* Substitute template parameters to obtain the specialization. */ |