aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-05-27 15:31:51 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-05-27 15:31:51 -0400
commit0453694246f95eac300dca7c931d0f25368da2bb (patch)
treefd06313568c97d53b3b50dafa7de168715e28b7a /gcc/cp/pt.c
parent4cc4f2f437f583f78c3bae594bb019b7a767eb13 (diff)
downloadgcc-0453694246f95eac300dca7c931d0f25368da2bb.zip
gcc-0453694246f95eac300dca7c931d0f25368da2bb.tar.gz
gcc-0453694246f95eac300dca7c931d0f25368da2bb.tar.bz2
re PR c++/49181 ([C++0x] Error reporting routines re-entered)
PR c++/49181 * pt.c (get_mostly_instantiated_function_type): Use push_access_scope. From-SVN: r174352
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 767c4f6..71fe0a0 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -18080,9 +18080,9 @@ get_mostly_instantiated_function_type (tree decl)
TMPL_ARGS_DEPTH (targs),
make_tree_vec (DECL_NTPARMS (tmpl)));
- /* Disable access control as this function is used only during
- name-mangling. */
- push_deferring_access_checks (dk_no_check);
+ /* Make sure that we can see identifiers, and compute access
+ correctly. */
+ push_access_scope (decl);
++processing_template_decl;
/* Now, do the (partial) substitution to figure out the
@@ -18097,7 +18097,7 @@ get_mostly_instantiated_function_type (tree decl)
TREE_VEC_LENGTH (partial_args)--;
tparms = tsubst_template_parms (tparms, partial_args, tf_error);
- pop_deferring_access_checks ();
+ pop_access_scope (decl);
}
return fn_type;