From 8fb3401bdca2d6b4f50d787f5faecf2a998535d2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 26 Sep 2011 13:58:47 +0000 Subject: pt.c (convert_nontype_argument): Handle NULLPTR_TYPE. /cp 2011-09-26 Paolo Carlini * pt.c (convert_nontype_argument): Handle NULLPTR_TYPE. /testsuite 2011-09-26 Paolo Carlini * g++.dg/cpp0x/nullptr25.C: New. From-SVN: r179199 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 10 ++++++++++ 2 files changed, 14 insertions(+) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eb870c7..fe7589e9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-09-26 Paolo Carlini + * pt.c (convert_nontype_argument): Handle NULLPTR_TYPE. + +2011-09-26 Paolo Carlini + PR c++/26747 * cp-gimplify.c (get_bc_label): Remove obsolete diagnostics. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ebadebf..2c398e0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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 (); -- cgit v1.1