diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-18 19:30:38 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-18 19:30:38 +0100 |
| commit | 8a9ff71f5bbaa6828c82025b5481bed75f6a56c5 (patch) | |
| tree | 601021fa5080c0205f1b1d44ee0759c737ef1b79 /libstdc++-v3 | |
| parent | e25a366f6fbfec00094d243a41b0d9dacdd66575 (diff) | |
| download | gcc-8a9ff71f5bbaa6828c82025b5481bed75f6a56c5.zip gcc-8a9ff71f5bbaa6828c82025b5481bed75f6a56c5.tar.gz gcc-8a9ff71f5bbaa6828c82025b5481bed75f6a56c5.tar.bz2 | |
Fix typos in experimental::shared_ptr
* include/experimental/bits/shared_ptr.h (shared_ptr(shared_ptr&&)):
Remove const from parameter.
(operator<(const shared_ptr<T>&, nullptr_t)): Use correct
specialization of std::less.
* testsuite/experimental/memory/shared_ptr/comparison/comparison.cc:
Test comparison with nullptr and actually call test functions.
From-SVN: r241310
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/experimental/bits/shared_ptr.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc | 10 |
3 files changed, 19 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d371b85..6c08d54 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2016-10-18 Jonathan Wakely <jwakely@redhat.com> + * include/experimental/bits/shared_ptr.h (shared_ptr(shared_ptr&&)): + Remove const from parameter. + (operator<(const shared_ptr<T>&, nullptr_t)): Use correct + specialization of std::less. + * testsuite/experimental/memory/shared_ptr/comparison/comparison.cc: + Test comparison with nullptr and actually call test functions. + * include/bits/uses_allocator.h (__is_uses_allocator_constructible_v) (__is_nothrow_uses_allocator_constructible_v): Only define for C++14 and later. diff --git a/libstdc++-v3/include/experimental/bits/shared_ptr.h b/libstdc++-v3/include/experimental/bits/shared_ptr.h index d61789a..7a232f4 100644 --- a/libstdc++-v3/include/experimental/bits/shared_ptr.h +++ b/libstdc++-v3/include/experimental/bits/shared_ptr.h @@ -672,7 +672,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION shared_ptr(const shared_ptr<_Tp1>& __r) noexcept : _Base_type(__r) { } - shared_ptr(const shared_ptr<_Tp>&& __r) noexcept + shared_ptr(shared_ptr&& __r) noexcept : _Base_type(std::move(__r)) { } template<typename _Tp1, typename = _Compatible<_Tp1>> @@ -815,7 +815,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator<(const shared_ptr<_Tp>& __a, nullptr_t) noexcept { using __elem_t = typename shared_ptr<_Tp>::element_type; - return std::less<__elem_t>()(__a.get(), nullptr); + return std::less<__elem_t*>()(__a.get(), nullptr); } template<typename _Tp> diff --git a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc index fafa6eb..d733811 100644 --- a/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc +++ b/libstdc++-v3/testsuite/experimental/memory/shared_ptr/comparison/comparison.cc @@ -73,8 +73,18 @@ test02() return 0; } +void +test03() +{ + std::experimental::shared_ptr<A[5]> a(new A[5]); + VERIFY( nullptr < a ); +} + int main() { + test01(); + test02(); + test03(); return 0; } |