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

re PR c++/49418 (G++ discards cv-quals from template parameter types) 

PR c++/49418
	* typeck2.c (build_functional_cast): Strip cv-quals for value init.
	* init.c (build_zero_init_1): Not here.

From-SVN: r175368
This commit is contained in:
Jason Merrill 2011-06-23 22:18:42 -04:00 committed by Jason Merrill
parent cb77790aaf
commit 908e152c84
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2011-06-23 Jason Merrill <jason@redhat.com>
PR c++/49519
* typeck2.c (build_functional_cast): Strip cv-quals for value init.
* init.c (build_zero_init_1): Not here.
PR c++/35255
* pt.c (resolve_overloaded_unification): Fix DR 115 handling.

2
gcc/cp/init.c
View File

@ -176,7 +176,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p,
initialized are initialized to zero. */
;
else if (SCALAR_TYPE_P (type))
init = convert (cv_unqualified (type), integer_zero_node);
init = convert (type, integer_zero_node);
else if (CLASS_TYPE_P (type))
{
tree field;

2
gcc/cp/typeck2.c
View File

@ -1641,7 +1641,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
{
if (VOID_TYPE_P (type))
return void_zero_node;
return build_value_init (type, complain);
return build_value_init (cv_unqualified (type), complain);
}
/* This must build a C cast. */