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

PR c++/81671 - nullptr_t template parameter

Browse Source 
* pt.c (convert_nontype_argument): Fix nullptr_t check.

From-SVN: r251046
This commit is contained in:
Jason Merrill 2017-08-11 01:35:39 -04:00 committed by Jason Merrill
parent 81f2064e41
commit 5675808f5c
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2017-08-11 Jason Merrill <jason@redhat.com>
PR c++/81671 - nullptr_t template parameter
* pt.c (convert_nontype_argument): Fix nullptr_t check.
2017-08-10 Jason Merrill <jason@redhat.com>
PR c++/81359 - Unparsed NSDMI error from SFINAE context.

2
gcc/cp/pt.c
View File

@ -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 "

15
gcc/testsuite/g++.dg/cpp0x/nullptr39.C Normal file
View File

@ -0,0 +1,15 @@
// PR c++/81671
// { dg-do compile { target c++11 } }
namespace std { typedef decltype(nullptr) nullptr_t; }
template<class R, class CB> struct Bar
{};
template<class R> struct Bar<R, std::nullptr_t>
{
template<std::nullptr_t> struct Bind { constexpr static int const cb = 0; };
};
int foo()
{
return Bar<int, decltype(nullptr)>::Bind<nullptr>::cb;
}