From 13fd0ca29b2ec5e5a191756219897baecc3d20d3 Mon Sep 17 00:00:00 2001 From: redi Date: Wed, 9 Nov 2011 01:26:04 +0000 Subject: [PATCH] * include/bits/stl_vector.h (vector::_Alloc_traits): Make private. * include/debug/vector: Add allocator-extended constructors, ensure move assignment and swap have same allocator propagation semantics and exceptions specification as base class. * include/profile/vector: Likewise. (vector::push_back(_Tp&&)): Forward argument as rvalue. * testsuite/23_containers/vector/debug/alloc_prop.cc: New. * doc/xml/manual/status_cxx2011.xml: Clarify status of container requirements with respect to allocators. (status.iso.200x): Add anchor for old ID to preserve existing links. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181189 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 13 ++++ libstdc++-v3/doc/xml/manual/status_cxx2011.xml | 7 +- libstdc++-v3/include/bits/stl_vector.h | 2 +- libstdc++-v3/include/debug/vector | 29 +++++-- libstdc++-v3/include/profile/vector | 32 ++++++-- .../23_containers/vector/debug/alloc_prop.cc | 89 ++++++++++++++++++++++ 6 files changed, 158 insertions(+), 14 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/vector/debug/alloc_prop.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 24cc7b67b62..b8b6e358dce 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2011-11-09 Jonathan Wakely + + * include/bits/stl_vector.h (vector::_Alloc_traits): Make private. + * include/debug/vector: Add allocator-extended constructors, ensure + move assignment and swap have same allocator propagation semantics + and exceptions specification as base class. + * include/profile/vector: Likewise. + (vector::push_back(_Tp&&)): Forward argument as rvalue. + * testsuite/23_containers/vector/debug/alloc_prop.cc: New. + * doc/xml/manual/status_cxx2011.xml: Clarify status of container + requirements with respect to allocators. + (status.iso.200x): Add anchor for old ID to preserve existing links. + 2011-11-08 Jonathan Wakely * include/bits/shared_ptr_base.h (_Sp_counted_ptr): Make 'final'. diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml index 2715b2a77ab..51785fcb812 100644 --- a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml +++ b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml @@ -14,6 +14,7 @@ + This table is based on the table of contents of ISO/IEC JTC1 SC22 WG21 Doc No: N3290 Date: 2011-04-11 Final Draft International Standard, Standard for Programming Language C++ @@ -1373,10 +1374,12 @@ particular release. + 23.2.1 General container requirements - Y - + Partial + Only vector meets the requirements + relating to allocator use and propagation. 23.2.2 diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 9b7b698925f..ec21807321d 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -214,11 +214,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER typedef _Vector_base<_Tp, _Alloc> _Base; typedef typename _Base::_Tp_alloc_type _Tp_alloc_type; + typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Alloc_traits; public: typedef _Tp value_type; typedef typename _Base::pointer pointer; - typedef __gnu_cxx::__alloc_traits<_Tp_alloc_type> _Alloc_traits; typedef typename _Alloc_traits::const_pointer const_pointer; typedef typename _Alloc_traits::reference reference; typedef typename _Alloc_traits::const_reference const_reference; diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index 0f252a059dc..82662b44605 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -52,6 +52,10 @@ namespace __debug typedef typename _Base::const_iterator _Base_const_iterator; typedef __gnu_debug::_Equal_to<_Base_const_iterator> _Equal; +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + typedef __gnu_cxx::__alloc_traits<_Allocator> _Alloc_traits; +#endif + public: typedef typename _Base::reference reference; typedef typename _Base::const_reference const_reference; @@ -116,6 +120,17 @@ namespace __debug __x._M_guaranteed_capacity = 0; } + vector(const vector& __x, const allocator_type& __a) + : _Base(__x, __a), _M_guaranteed_capacity(__x.size()) { } + + vector(vector&& __x, const allocator_type& __a) + : _Base(std::move(__x), __a), + _M_guaranteed_capacity(this->size()) + { + __x._M_invalidate_all(); + __x._M_guaranteed_capacity = 0; + } + vector(initializer_list __l, const allocator_type& __a = allocator_type()) : _Base(__l, __a), @@ -135,12 +150,13 @@ namespace __debug #ifdef __GXX_EXPERIMENTAL_CXX0X__ vector& - operator=(vector&& __x) + operator=(vector&& __x) noexcept(_Alloc_traits::_S_nothrow_move()) { - // NB: DR 1204. - // NB: DR 675. - clear(); - swap(__x); + _Base::operator=(std::move(__x)); + this->_M_invalidate_all(); + _M_update_guaranteed_capacity(); + __x._M_invalidate_all(); + __x._M_guaranteed_capacity = 0; return *this; } @@ -513,6 +529,9 @@ namespace __debug void swap(vector& __x) +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + noexcept(_Alloc_traits::_S_nothrow_swap()) +#endif { _Base::swap(__x); this->_M_swap(__x); diff --git a/libstdc++-v3/include/profile/vector b/libstdc++-v3/include/profile/vector index 7a33e88be01..86aefd649e3 100644 --- a/libstdc++-v3/include/profile/vector +++ b/libstdc++-v3/include/profile/vector @@ -50,6 +50,10 @@ namespace __profile { typedef _GLIBCXX_STD_C::vector<_Tp, _Allocator> _Base; +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + typedef __gnu_cxx::__alloc_traits<_Allocator> _Alloc_traits; +#endif + public: typedef typename _Base::reference reference; typedef typename _Base::const_reference const_reference; @@ -143,6 +147,20 @@ namespace __profile __profcxx_vector_construct2(this); } + vector(const _Base& __x, const _Allocator& __a) + : _Base(__x) + { + __profcxx_vector_construct(this, this->capacity()); + __profcxx_vector_construct2(this); + } + + vector(vector&& __x, const _Allocator& __a) noexcept + : _Base(std::move(__x), __a) + { + __profcxx_vector_construct(this, this->capacity()); + __profcxx_vector_construct2(this); + } + vector(initializer_list __l, const allocator_type& __a = allocator_type()) : _Base(__l, __a) { } @@ -163,12 +181,11 @@ namespace __profile #ifdef __GXX_EXPERIMENTAL_CXX0X__ vector& - operator=(vector&& __x) + operator=(vector&& __x) noexcept(_Alloc_traits::_S_nothrow_move()) { - // NB: DR 1204. - // NB: DR 675. - this->clear(); - this->swap(__x); + __profcxx_vector_destruct(this, this->capacity(), this->size()); + __profcxx_vector_destruct2(this); + static_cast<_Base&>(*this) = std::move(__x); return *this; } @@ -329,7 +346,7 @@ namespace __profile push_back(_Tp&& __x) { size_type __old_size = this->capacity(); - _Base::push_back(__x); + _Base::push_back(std::move(__x)); _M_profile_resize(this, __old_size, this->capacity()); } @@ -373,6 +390,9 @@ namespace __profile void swap(vector& __x) +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + noexcept(_Alloc_traits::_S_nothrow_swap()) +#endif { _Base::swap(__x); } diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/alloc_prop.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/alloc_prop.cc new file mode 100644 index 00000000000..fffc4663659 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/debug/alloc_prop.cc @@ -0,0 +1,89 @@ +// Copyright (C) 2011 Free Software Foundation, Inc. +// +// 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 +// . +// +// { dg-do compile } +// { dg-options "-std=gnu++11" } + +#include +#include +#include + +template + void + test() + { + typedef std::vector base; + typedef __gnu_debug::vector debug; + + using std::is_nothrow_default_constructible; + using std::is_nothrow_copy_constructible; + using std::is_nothrow_move_constructible; + using std::is_nothrow_copy_assignable; + using std::is_nothrow_move_assignable; + + static_assert( + is_nothrow_default_constructible::value + == is_nothrow_default_constructible::value, + "nothrow default constructible"); + + static_assert( + is_nothrow_copy_constructible::value + == is_nothrow_copy_constructible::value, + "nothrow copy constructible"); + + static_assert( + is_nothrow_move_constructible::value + == is_nothrow_move_constructible::value, + "nothrow move constructible"); + + static_assert( + is_nothrow_copy_assignable::value + == is_nothrow_copy_assignable::value, + "nothrow move assignable"); + + static_assert( + is_nothrow_move_assignable::value + == is_nothrow_move_assignable::value, + "nothrow move assignable"); + } + +struct X +{ + X() { } + ~X() { } + X(const X&) { } + X(X&&) { } + X& operator=(const X&) { } + X& operator=(X&&) { } +}; + +int main() +{ + using __gnu_test::propagating_allocator; + using __gnu_test::SimpleAllocator; + + test>(); + test>(); + test>(); + test>(); + test>(); + test>(); + test>(); + test>(); + + return 0; +} -- 2.11.0