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

pt.c (convert_nontype_argument): Handle NULLPTR_TYPE. 

/cp
2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* pt.c (convert_nontype_argument): Handle NULLPTR_TYPE.

/testsuite
2011-09-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/nullptr25.C: New.

From-SVN: r179199
This commit is contained in:
Paolo Carlini 2011-09-26 13:58:47 +00:00 committed by Paolo Carlini
parent 734e01f0a3
commit 8fb3401bdc
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-26 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (convert_nontype_argument): Handle NULLPTR_TYPE.
2011-09-26 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/26747

10
gcc/cp/pt.c
View File

@ -5951,6 +5951,16 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
if (expr == error_mark_node)
return expr;
}
else if (NULLPTR_TYPE_P (type))
{
if (expr != nullptr_node)
{
error ("%qE is not a valid template argument for type %qT "
"because it is of type %qT", expr, type, TREE_TYPE (expr));
return NULL_TREE;
}
return expr;
}
/* A template non-type parameter must be one of the above. */
else
gcc_unreachable ();

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2011-09-26 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/cpp0x/nullptr25.C: New.
2011-09-26 Richard Guenther <rguenther@suse.de>
PR tree-optimization/50472

6
gcc/testsuite/g++.dg/cpp0x/nullptr25.C Normal file
View File

@ -0,0 +1,6 @@
// { dg-options -std=c++0x }
template<decltype(nullptr)>
struct nt{};
nt<nullptr> x;