diff options
author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-03 17:48:36 +0000 |
---|---|---|
committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-03 17:48:36 +0000 |
commit | d7f56aae6075e90d4697eae5a952ab31124a4a65 (patch) | |
tree | 54b27c0d7522595986d603e6ad8e917772e53451 /libstdc++-v3/testsuite | |
parent | c69ec07da595081a3bc476bebe4729049b6254d8 (diff) | |
download | gcc-d7f56aae6075e90d4697eae5a952ab31124a4a65.tar.gz |
gcc/cp
2014-06-03 Paolo Carlini <paolo.carlini@oracle.com>
DR 1423
PR c++/52174
* call.c (standard_conversion): Convert nullptr to bool only
in case of direct-initialization.
(convert_like_real): Provide informative error message.
gcc/testsuite
2014-06-03 Paolo Carlini <paolo.carlini@oracle.com>
DR 1423
PR c++/52174
* g++.dg/cpp0x/nullptr31.C: New.
* g++.dg/cpp0x/sfinae-nullptr1.C: Likewise.
* g++.dg/cpp0x/nullptr17.C: Update.
libstdc++-v3
2014-06-03 Paolo Carlini <paolo.carlini@oracle.com>
DR 1423
PR c++/52174
* testsuite/20_util/is_assignable/value.cc: Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211195 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite')
-rw-r--r-- | libstdc++-v3/testsuite/20_util/is_assignable/value.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/testsuite/20_util/is_assignable/value.cc b/libstdc++-v3/testsuite/20_util/is_assignable/value.cc index ddd73b48b9a..e9db58e6d16 100644 --- a/libstdc++-v3/testsuite/20_util/is_assignable/value.cc +++ b/libstdc++-v3/testsuite/20_util/is_assignable/value.cc @@ -174,7 +174,7 @@ static_assert(!std::is_assignable<bool&, SE>::value, "Error"); static_assert(std::is_assignable<bool&, void*>::value, "Error"); static_assert(std::is_assignable<bool&, int B::*>::value, "Error"); static_assert(std::is_assignable<bool&, void*>::value, "Error"); -static_assert(std::is_assignable<bool&, std::nullptr_t>::value, "Error"); +static_assert(!std::is_assignable<bool&, std::nullptr_t>::value, "Error"); static_assert(std::is_assignable<std::nullptr_t&, std::nullptr_t>::value, "Error"); |