OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pt.c (comp_template_args): Remove. 

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.

From-SVN: r231723
This commit is contained in:
Paolo Carlini 2015-12-16 21:45:14 +00:00 committed by Paolo Carlini
parent f95ff97f09
commit 6cb6583c5f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
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.
2015-12-16 Jason Merrill <jason@redhat.com>
PR c++/68309

3
gcc/cp/cp-tree.h
View File

@ -6115,7 +6115,8 @@ extern int template_class_depth (tree);
extern int is_specialization_of (tree, tree);
extern bool is_specialization_of_friend (tree, tree);
extern tree get_pattern_parm (tree, tree);
extern int comp_template_args (tree, tree);
extern int comp_template_args (tree, tree, tree * = NULL,
tree * = NULL);
extern tree maybe_process_partial_specialization (tree);
extern tree most_specialized_instantiation (tree);
extern void print_candidates (tree);

19
gcc/cp/pt.c
View File

@ -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,