diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-25 03:30:11 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-25 03:30:11 +0000 |
| commit | c85d5a000d09ffe63d1706b7dd25fed5215f227a (patch) | |
| tree | 17fe7bac5c9426d507d0aa7ea093be49a6eb893d /gcc/cp/cp-tree.h | |
| parent | 5ea7bc9d1b6e0c88c128379cddad48307bbb77af (diff) | |
| download | ppe42-gcc-c85d5a000d09ffe63d1706b7dd25fed5215f227a.tar.gz ppe42-gcc-c85d5a000d09ffe63d1706b7dd25fed5215f227a.zip | |
PR c++/51213 (again)
* pt.c (deduction_tsubst_fntype): Remove.
(fn_type_unification): Check deduction depth and call
instantiate_template here. Handle default argument access checks.
(determine_specialization): Suppress access control.
(tsubst_decl): Check for excessive deduction depth.
(recheck_decl_substitution): Make sure access control is on.
(type_unification_real): Don't mess with access deferring here.
(get_bindings): Adjust for fn_type_unification return type.
* call.c (enum rejection_reason_code): Drop rr_template_instantiation.
(template_instantiation_rejection): Remove.
(struct rejection_reason): Change targs to num_targs.
(template_unification_rejection, print_z_candidate): Adjust.
(add_template_candidate_real): Adjust for fn_type_unification change.
* class.c (resolve_address_of_overloaded_function): Likewise.
* cp-tree.h: Adjust declaration.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@190664 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index a787ec1047b..7ffc929bc97 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5340,7 +5340,7 @@ extern int uses_template_parms_level (tree, int); extern bool in_template_function (void); extern tree instantiate_class_template (tree); extern tree instantiate_template (tree, tree, tsubst_flags_t); -extern int fn_type_unification (tree, tree, tree, +extern tree fn_type_unification (tree, tree, tree, const tree *, unsigned int, tree, unification_kind_t, int, bool); |
