diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 390bbcc1dfc0..b900bf56565f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2010-08-11 Paolo Carlini + + PR libstdc++/42925 + * include/bits/unique_ptr.h (operator==(const unique_ptr<>&, + nullptr_t), operator==(nullptr_t, const unique_ptr<>&), + operator!=(const unique_ptr<>&, nullptr_t), + operator!=(nullptr_t, const unique_ptr<>&)): Add. + * include/bits/shared_ptr_base.h (operator==(const __shared_ptr<>&, + nullptr_t), operator==(nullptr_t, const __shared_ptr<>&), + operator!=(const __shared_ptr<>&, nullptr_t), + operator!=(nullptr_t, const __shared_ptr<>&)): Likewise. + * include/bits/shared_ptr.h (operator==(const shared_ptr<>&, + nullptr_t), operator==(nullptr_t, const shared_ptr<>&), + operator!=(const shared_ptr<>&, nullptr_t), + operator!=(nullptr_t, const shared_ptr<>&)): Likewise. + * testsuite/20_util/unique_ptr/comparison/42925.cc: New. + * testsuite/20_util/shared_ptr/comparison/42925.cc: Likewise. + * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust + dg-error line numbers. + 2010-08-11 Paolo Carlini * include/bits/unique_ptr.h: Replace _Tp_Deleter -> _Dp, and diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index fe79cdd1547d..2d9e6f771a61 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -317,11 +317,31 @@ _GLIBCXX_BEGIN_NAMESPACE(std) operator==(const shared_ptr<_Tp1>& __a, const shared_ptr<_Tp2>& __b) { return __a.get() == __b.get(); } + template + inline bool + operator==(const shared_ptr<_Tp>& __a, nullptr_t) + { return __a.get() == nullptr; } + + template + inline bool + operator==(nullptr_t, const shared_ptr<_Tp>& __b) + { return nullptr == __b.get(); } + template inline bool operator!=(const shared_ptr<_Tp1>& __a, const shared_ptr<_Tp2>& __b) { return __a.get() != __b.get(); } + template + inline bool + operator!=(const shared_ptr<_Tp>& __a, nullptr_t) + { return __a.get() != nullptr; } + + template + inline bool + operator!=(nullptr_t, const shared_ptr<_Tp>& __b) + { return nullptr != __b.get(); } + template inline bool operator<(const shared_ptr<_Tp1>& __a, const shared_ptr<_Tp2>& __b) diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 802d1b5b70ee..183c241e29bc 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -851,12 +851,32 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const __shared_ptr<_Tp2, _Lp>& __b) { return __a.get() == __b.get(); } + template + inline bool + operator==(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) + { return __a.get() == nullptr; } + + template + inline bool + operator==(nullptr_t, const __shared_ptr<_Tp, _Lp>& __b) + { return nullptr == __b.get(); } + template inline bool operator!=(const __shared_ptr<_Tp1, _Lp>& __a, const __shared_ptr<_Tp2, _Lp>& __b) { return __a.get() != __b.get(); } + template + inline bool + operator!=(const __shared_ptr<_Tp, _Lp>& __a, nullptr_t) + { return __a.get() != nullptr; } + + template + inline bool + operator!=(nullptr_t, const __shared_ptr<_Tp, _Lp>& __b) + { return nullptr != __b.get(); } + template inline bool operator<(const __shared_ptr<_Tp1, _Lp>& __a, diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h index 1dfba0b825e0..d6adb1459e31 100644 --- a/libstdc++-v3/include/bits/unique_ptr.h +++ b/libstdc++-v3/include/bits/unique_ptr.h @@ -101,7 +101,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) public: typedef typename _Pointer::type pointer; typedef _Tp element_type; - typedef _Dp deleter_type; + typedef _Dp deleter_type; // Constructors. unique_ptr() @@ -432,6 +432,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const unique_ptr<_Up, _Ep>& __y) { return __x.get() == __y.get(); } + template + inline bool + operator==(const unique_ptr<_Tp, _Dp>& __x, nullptr_t) + { return __x.get() == nullptr; } + + template + inline bool + operator==(nullptr_t, const unique_ptr<_Tp, _Dp>& __y) + { return nullptr == __y.get(); } + template inline bool @@ -439,6 +449,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const unique_ptr<_Up, _Ep>& __y) { return !(__x.get() == __y.get()); } + template + inline bool + operator!=(const unique_ptr<_Tp, _Dp>& __x, nullptr_t) + { return __x.get() != nullptr; } + + template + inline bool + operator!=(nullptr_t, const unique_ptr<_Tp, _Dp>& __y) + { return nullptr != __y.get(); } + template inline bool diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/42925.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/42925.cc new file mode 100644 index 000000000000..41e09d666ae9 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/comparison/42925.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2010 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 20.9.11.2 Class template shared_ptr [util.smartptr.shared] + +#include + +// libstdc++/42925 (also see GB 99) +void test01() +{ + std::shared_ptr ptr; + if (ptr == 0) + { } + if (0 == ptr) + { } + if (ptr != 0) + { } + if (0 != ptr) + { } +} diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/42925.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/42925.cc new file mode 100644 index 000000000000..e3dfad46f884 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/comparison/42925.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2010 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 20.9.10 Class template unique_ptr [unique.ptr] + +#include + +// libstdc++/42925 (also see GB 99) +void test01() +{ + std::unique_ptr ptr; + if (ptr == 0) + { } + if (0 == ptr) + { } + if (ptr != 0) + { } + if (0 != ptr) + { } +} diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc index ea84c7e82a9f..f124718016eb 100644 --- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc +++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc @@ -41,9 +41,9 @@ main() return 0; } -// { dg-warning "note" "" { target *-*-* } 327 } -// { dg-warning "note" "" { target *-*-* } 446 } -// { dg-warning "note" "" { target *-*-* } 863 } +// { dg-warning "note" "" { target *-*-* } 347 } +// { dg-warning "note" "" { target *-*-* } 466 } +// { dg-warning "note" "" { target *-*-* } 883 } // { dg-warning "note" "" { target *-*-* } 580 } // { dg-warning "note" "" { target *-*-* } 1027 } // { dg-warning "note" "" { target *-*-* } 340 }