diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-08-18 19:04:48 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-08-18 19:04:48 +0100 |
| commit | f641b2d6bbe4702f1374d12c773d1f2027040524 (patch) | |
| tree | d3749d9b5c5be5a6df95c0d3c15e6656a6463eae | |
| parent | e92e7c15e1daf77a8e268aa037789a9b47106cba (diff) | |
| download | gcc-f641b2d6bbe4702f1374d12c773d1f2027040524.zip gcc-f641b2d6bbe4702f1374d12c773d1f2027040524.tar.gz gcc-f641b2d6bbe4702f1374d12c773d1f2027040524.tar.bz2 | |
re PR c++/67216 (false is still a null pointer constant)
PR c++/67216
* testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc:
Fix use of safe-bool idiom that isn't valid in C++11.
From-SVN: r226986
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 351c66f..2287606 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2015-08-18 Jonathan Wakely <jwakely@redhat.com> + PR c++/67216 + * testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc: + Fix use of safe-bool idiom that isn't valid in C++11. + * include/bits/ptr_traits.h: Include <bits/move.h> for addressof. PR libstdc++/67066 diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc index 0c93f36..e7cefaf 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/observers/bool_conv.cc @@ -31,9 +31,9 @@ test01() bool test __attribute__((unused)) = true; const std::tr1::shared_ptr<A> p1; - VERIFY( p1 == false ); + VERIFY( bool(p1) == false ); const std::tr1::shared_ptr<A> p2(p1); - VERIFY( p2 == false ); + VERIFY( bool(p2) == false ); return 0; } |