summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/bits/stl_bvector.h
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-04 15:12:34 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-04 15:12:34 +0000
commit707bff495c5ac72c0d591172fd6b45b5fa723b46 (patch)
tree069a64e945b585943cd42f5fb19ab939aaf5ee19 /libstdc++-v3/include/bits/stl_bvector.h
parent333992083587f543b4162238685c7ec6fdf40f30 (diff)
downloadppe42-gcc-707bff495c5ac72c0d591172fd6b45b5fa723b46.tar.gz
ppe42-gcc-707bff495c5ac72c0d591172fd6b45b5fa723b46.zip
2007-10-04 Paolo Carlini <pcarlini@suse.de>
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Adjust dg-error line number. * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/vector/requirements/dr438/ constructor_2_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Adjust dg-error line number. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Adjust dg-error line number. * testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Likewise. 2007-10-04 Chris Jefferson <chris@bubblescope.net> Paolo Carlini <pcarlini@suse.de> * include/bits/stl_list.h (list<>::list(list&&), list<>::operator=(list&&)): Add. (list<>::swap): Adjust. (swap(list&&, list& __y), swap(list&, list&& __y)): Add. * include/bits/stl_vector.h (vector<>::vector(vector&&), vector<>::operator=(vector&&)): Add. (vector<>::swap): Adjust. (swap(vector&&, vector& __y), swap(vector&, vector&& __y)): Add. * include/bits/stl_bvector.h (vector<>::vector(vector&&), vector<>::operator=(vector&&)): Add. (vector<>::swap): Adjust. * include/bits/stl_deque.h (deque<>::deque(deque&&), deque<>::operator=(deque&&)): Add. (deque<>::swap): Adjust. (swap(deque&&, deque& __y), swap(deque&, deque&& __y)): Add. * include/bits/stl_set.h (set<>::set(set&&), set<>::operator=(set&&)): Add. (set<>::swap): Adjust. (swap(set&&, set& __y), swap(set&, set&& __y)): Add. * include/bits/stl_map.h (map<>::map(map&&), map<>::operator=(map&&)): Add. (map<>::swap): Adjust. (swap(map&&, map& __y), swap(map&, map&& __y)): Add. * include/bits/stl_multiset.h (multiset<>::multiset(multiset&&), multiset<>::operator=(multiset&&)): Add. (smultiet<>::swap): Adjust. (swap(multiset&&, multiset& __y), swap(multiset&, multiset&& __y)): Add. * include/bits/stl_multimap.h (multimap<>::multimap(multimap&&), multimap<>::operator=(multimap&&)): Add. (multimap<>::swap): Adjust. (swap(multimap&&, multimap& __y), swap(multimap&, multimap&& __y)): Add. 2007-10-04 Paolo Carlini <pcarlini@suse.de> Avoid copying some allocator objects. * include/bits/stl_list.h (_List_impl::_List_impl(), _List_base::_List_base(), list<>::list()): Add. * include/bits/stl_vector.h (_Vector_impl::_Vector_impl(), _Vector_base::_Vector_base(), vector<>::vector()): Add. * include/bits/stl_bvector.h (_Bvector_impl::_Bvector_impl(), _Bvector_base::_Bvector_base(), vector<>::vector()): Add. * include/bits/stl_deque.h (_Deque_impl::_Deque_impl(), _Deque_base::_Deque_base(), deque<>::deque()): Add. * include/bits/stl_tree.h (_Rb_tree_impl<>::_Rb_tree_impl(), _Rb_tree_impl<>::_M_initialize): Add. (_Rb_tree<>::_Rb_tree(const _Compare&, const allocator_type&), _Rb_tree(const _Rb_tree&)): Adjust. * include/bits/stl_set.h (set<>::set(), set(_InputIterator, _InputIterator)): Use _M_t default constructor. * include/bits/stl_map.h (map<>::map(), set(_InputIterator, _InputIterator)): Use _M_t default constructor. * include/bits/stl_multiset.h (multiset<>::multiset(), multiset(_InputIterator, _InputIterator)): Use _M_t default constructor. * include/bits/stl_multimap.h (multimap<>::multimap(), multimap(_InputIterator, _InputIterator)): Use _M_t default constructor. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129013 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/stl_bvector.h')
-rw-r--r--libstdc++-v3/include/bits/stl_bvector.h37
1 files changed, 34 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index a2a86f26f17..db9061b90fb 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -385,6 +385,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_Bit_iterator _M_start;
_Bit_iterator _M_finish;
_Bit_type* _M_end_of_storage;
+
+ _Bvector_impl()
+ : _Bit_alloc_type(), _M_start(), _M_finish(), _M_end_of_storage(0)
+ { }
+
_Bvector_impl(const _Bit_alloc_type& __a)
: _Bit_alloc_type(__a), _M_start(), _M_finish(), _M_end_of_storage(0)
{ }
@@ -405,7 +410,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
get_allocator() const
{ return allocator_type(_M_get_Bit_allocator()); }
- _Bvector_base(const allocator_type& __a) : _M_impl(__a) { }
+ _Bvector_base()
+ : _M_impl() { }
+
+ _Bvector_base(const allocator_type& __a)
+ : _M_impl(__a) { }
~_Bvector_base()
{ this->_M_deallocate(); }
@@ -480,8 +489,11 @@ template<typename _Alloc>
using _Base::_M_get_Bit_allocator;
public:
+ vector()
+ : _Base() { }
+
explicit
- vector(const allocator_type& __a = allocator_type())
+ vector(const allocator_type& __a)
: _Base(__a) { }
explicit
@@ -501,6 +513,12 @@ template<typename _Alloc>
_M_copy_aligned(__x.begin(), __x.end(), this->_M_impl._M_start);
}
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ vector(vector&& __x)
+ : _Base(__x._M_get_Bit_allocator())
+ { this->swap(__x); }
+#endif
+
template<typename _InputIterator>
vector(_InputIterator __first, _InputIterator __last,
const allocator_type& __a = allocator_type())
@@ -527,6 +545,15 @@ template<typename _Alloc>
return *this;
}
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ vector&
+ operator=(vector&& __x)
+ {
+ this->swap(__x);
+ return *this;
+ }
+#endif
+
// assign(), a generalized assignment member function. Two
// versions: one that takes a count, and one that takes a range.
// The range version is a member template, so we dispatch on whether
@@ -681,7 +708,11 @@ template<typename _Alloc>
}
void
- swap(vector<bool, _Alloc>& __x)
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ swap(vector&& __x)
+#else
+ swap(vector& __x)
+#endif
{
std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
OpenPOWER on IntegriCloud