diff options
| author | Jason Merrill <jason@redhat.com> | 2017-08-11 01:35:39 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-08-11 01:35:39 -0400 |
| commit | 5675808f5c0b9a91dfea8543828fa1c236b6467f (patch) | |
| tree | 863b5eda32df704f9a7fb8d0a1dbd3c3d7f2c92d /gcc/cp/pt.c | |
| parent | 81f2064e41921cf8752d3ecf7e692ddb0bc865cc (diff) | |
| download | gcc-5675808f5c0b9a91dfea8543828fa1c236b6467f.zip gcc-5675808f5c0b9a91dfea8543828fa1c236b6467f.tar.gz gcc-5675808f5c0b9a91dfea8543828fa1c236b6467f.tar.bz2 | |
PR c++/81671 - nullptr_t template parameter
* pt.c (convert_nontype_argument): Fix nullptr_t check.
From-SVN: r251046
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0f899b9..bf1f75d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6879,7 +6879,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) } else if (NULLPTR_TYPE_P (type)) { - if (expr != nullptr_node) + if (!NULLPTR_TYPE_P (TREE_TYPE (expr))) { if (complain & tf_error) error ("%qE is not a valid template argument for type %qT " |