procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pt.c (check_nontype_parm): Rename to ...

Browse source 
* pt.c (check_nontype_parm): Rename to ...
	(invalid_nontype_parm_type_p): ... here.
	(process_template_parm): Adjust.
	(convert_template_argument): Adjust.

From-SVN: r39040
This commit is contained in:
Nathan Sidwell 2001-01-15 16:18:43 +00:00 • committed by Nathan Sidwell
parent 6c98269caa
commit 11b810f116
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2001-01-15 Nathan Sidwell <nathan@codesourcery.com>
* pt.c (check_nontype_parm): Rename to ...
(invalid_nontype_parm_type_p): ... here.
(process_template_parm): Adjust.
(convert_template_argument): Adjust.
2001-01-15 Nathan Sidwell <nathan@codesourcery.com>
* pt.c (check_nontype_parm): New function.

8
gcc/cp/pt.c
View file

@ -169,7 +169,7 @@ static tree for_each_template_parm_r PARAMS ((tree *, int *, void *));
static tree instantiate_clone PARAMS ((tree, tree));
static tree copy_default_args_to_explicit_spec_1 PARAMS ((tree, tree));
static void copy_default_args_to_explicit_spec PARAMS ((tree));
static int check_nontype_parm PARAMS ((tree, int));
static int invalid_nontype_parm_type_p PARAMS ((tree, int));
/* Called once to initialize pt.c. */
@ -1934,7 +1934,7 @@ process_template_parm (list, next)
/* A template parameter is not modifiable. */
TREE_READONLY (parm) = 1;
if (check_nontype_parm (TREE_TYPE (parm), 1))
if (invalid_nontype_parm_type_p (TREE_TYPE (parm), 1))
TREE_TYPE (parm) = void_type_node;
decl = build_decl (CONST_DECL, DECL_NAME (parm), TREE_TYPE (parm));
DECL_INITIAL (parm) = DECL_INITIAL (decl)
@ -3417,7 +3417,7 @@ convert_template_argument (parm, arg, args, complain, i, in_decl)
{
tree t = tsubst (TREE_TYPE (parm), args, complain, in_decl);
if (check_nontype_parm (t, complain))
if (invalid_nontype_parm_type_p (t, complain))
return error_mark_node;
if (processing_template_decl)
@ -10307,7 +10307,7 @@ current_instantiation ()
non-zero, then complain. */
static int
check_nontype_parm (type, complain)
invalid_nontype_parm_type_p (type, complain)
tree type;
int complain;
{