diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-16 21:45:14 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-16 21:45:14 +0000 |
| commit | f22d444018eb3d154d088d2ddfa38c4afe579e8f (patch) | |
| tree | 79685128dcd20d3b106a4f2f594ee8abd8bc7df7 /gcc/cp/pt.c | |
| parent | a865a0f2e01e631512e9954313d24b164c006073 (diff) | |
| download | gcc-f22d444018eb3d154d088d2ddfa38c4afe579e8f.tar.gz | |
2015-12-16 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (comp_template_args): Remove.
(comp_template_args_with_info): Rename to comp_template_args;
not static.
(add_pending_template): Adjust call.
* cp-tree.h (comp_template_args): Add default arguments.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231723 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 5cf2497f79a..da57fb2a45c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7881,9 +7881,9 @@ template_args_equal (tree ot, tree nt) template arguments. Returns 0 otherwise, and updates OLDARG_PTR and NEWARG_PTR with the offending arguments if they are non-NULL. */ -static int -comp_template_args_with_info (tree oldargs, tree newargs, - tree *oldarg_ptr, tree *newarg_ptr) +int +comp_template_args (tree oldargs, tree newargs, + tree *oldarg_ptr, tree *newarg_ptr) { int i; @@ -7913,15 +7913,6 @@ comp_template_args_with_info (tree oldargs, tree newargs, return 1; } -/* Returns 1 iff the OLDARGS and NEWARGS are in fact identical sets - of template arguments. Returns 0 otherwise. */ - -int -comp_template_args (tree oldargs, tree newargs) -{ - return comp_template_args_with_info (oldargs, newargs, NULL, NULL); -} - static void add_pending_template (tree d) { @@ -19051,8 +19042,8 @@ unify_pack_expansion (tree tparms, tree targs, tree packed_parms, tree bad_old_arg = NULL_TREE, bad_new_arg = NULL_TREE; tree old_args = ARGUMENT_PACK_ARGS (old_pack); - if (!comp_template_args_with_info (old_args, new_args, - &bad_old_arg, &bad_new_arg)) + if (!comp_template_args (old_args, new_args, + &bad_old_arg, &bad_new_arg)) /* Inconsistent unification of this parameter pack. */ return unify_parameter_pack_inconsistent (explain_p, bad_old_arg, |