cbc6c888f9
2007-11-09 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_deque.h (deque<>::operator=(deque&&)): Implement resolution of DR 675, call clear first. * include/bits/stl_list.h (list<>::operator=(list&&)): Likewise. * include/bits/stl_bvector.h (vector<bool>::operator=(vector&&)): Likewise. * include/bits/stl_vector.h (vector<>::operator=(vector&&)): Likewise. * include/bits/stl_map.h (map<>::operator=(map&&)): Likewise. * include/bits/stl_multimap.h (multimap<>::operator=(multimap&&)): Likewise. * include/bits/stl_multiset.h (multiset<>::operator=(multiset&&)): Likewise. * include/bits/stl_set.h (set<>::operator=(set&&)): Likewise. * include/debug/map.h (map<>::operator=(map&&)): Likewise. * include/debug/set.h (set<>::operator=(set&&)): Likewise. * include/debug/multimap.h (multimap<>::operator=(multimap&&)): Likewise. * include/debug/multiset.h (multiset<>::operator=(multiset&&)): Likewise. * include/debug/deque (deque<>::operator=(deque&&)): Likewise. * include/debug/list (list<>::operator=(list&&)): Likewise. * include/debug/vector (vector<>::operator=(vector&&)): Likewise. * testsuite/23_containers/multimap/moveable.cc: Adjust. * testsuite/23_containers/multiset/moveable.cc: Likewise. * testsuite/23_containers/set/moveable.cc: Likewise. * testsuite/23_containers/map/moveable.cc: Likewise. * testsuite/20_util/pair/moveable.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Adjust dg-error line numbers. * 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: Likewise. * 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. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Likewise. * 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. From-SVN: r130051
530 lines
14 KiB
C++
530 lines
14 KiB
C++
// Debugging vector implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2003, 2004, 2005, 2006, 2007
|
|
// 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 2, 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 COPYING. If not, write to the Free
|
|
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
// USA.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
/** @file debug/vector
|
|
* This file is a GNU debug extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_DEBUG_VECTOR
|
|
#define _GLIBCXX_DEBUG_VECTOR 1
|
|
|
|
#include <vector>
|
|
#include <utility>
|
|
#include <debug/safe_sequence.h>
|
|
#include <debug/safe_iterator.h>
|
|
|
|
namespace std
|
|
{
|
|
namespace __debug
|
|
{
|
|
template<typename _Tp,
|
|
typename _Allocator = std::allocator<_Tp> >
|
|
class vector
|
|
: public _GLIBCXX_STD_D::vector<_Tp, _Allocator>,
|
|
public __gnu_debug::_Safe_sequence<vector<_Tp, _Allocator> >
|
|
{
|
|
typedef _GLIBCXX_STD_D::vector<_Tp, _Allocator> _Base;
|
|
typedef __gnu_debug::_Safe_sequence<vector> _Safe_base;
|
|
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
typedef __gnu_debug::_After_nth_from<_Base_const_iterator> _After_nth;
|
|
|
|
public:
|
|
typedef typename _Base::reference reference;
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,vector>
|
|
iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,vector>
|
|
const_iterator;
|
|
|
|
typedef typename _Base::size_type size_type;
|
|
typedef typename _Base::difference_type difference_type;
|
|
|
|
typedef _Tp value_type;
|
|
typedef _Allocator allocator_type;
|
|
typedef typename _Base::pointer pointer;
|
|
typedef typename _Base::const_pointer const_pointer;
|
|
typedef std::reverse_iterator<iterator> reverse_iterator;
|
|
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
|
|
|
|
// 23.2.4.1 construct/copy/destroy:
|
|
explicit vector(const _Allocator& __a = _Allocator())
|
|
: _Base(__a), _M_guaranteed_capacity(0) { }
|
|
|
|
explicit vector(size_type __n, const _Tp& __value = _Tp(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__n, __value, __a), _M_guaranteed_capacity(__n) { }
|
|
|
|
template<class _InputIterator>
|
|
vector(_InputIterator __first, _InputIterator __last,
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__gnu_debug::__check_valid_range(__first, __last),
|
|
__last, __a),
|
|
_M_guaranteed_capacity(0)
|
|
{ _M_update_guaranteed_capacity(); }
|
|
|
|
vector(const vector& __x)
|
|
: _Base(__x), _Safe_base(), _M_guaranteed_capacity(__x.size()) { }
|
|
|
|
/// Construction from a release-mode vector
|
|
vector(const _Base& __x)
|
|
: _Base(__x), _Safe_base(), _M_guaranteed_capacity(__x.size()) { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
vector(vector&& __x)
|
|
: _Base(std::forward<vector>(__x)), _Safe_base(),
|
|
_M_guaranteed_capacity(this->size())
|
|
{
|
|
this->_M_swap(__x);
|
|
__x._M_guaranteed_capacity = 0;
|
|
}
|
|
#endif
|
|
|
|
~vector() { }
|
|
|
|
vector&
|
|
operator=(const vector& __x)
|
|
{
|
|
static_cast<_Base&>(*this) = __x;
|
|
this->_M_invalidate_all();
|
|
_M_update_guaranteed_capacity();
|
|
return *this;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
vector&
|
|
operator=(vector&& __x)
|
|
{
|
|
// NB: DR 675.
|
|
clear();
|
|
swap(__x);
|
|
return *this;
|
|
}
|
|
#endif
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
assign(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_valid_range(__first, __last);
|
|
_Base::assign(__first, __last);
|
|
this->_M_invalidate_all();
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
|
|
void
|
|
assign(size_type __n, const _Tp& __u)
|
|
{
|
|
_Base::assign(__n, __u);
|
|
this->_M_invalidate_all();
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
|
|
using _Base::get_allocator;
|
|
|
|
// iterators:
|
|
iterator
|
|
begin()
|
|
{ return iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
begin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
iterator
|
|
end()
|
|
{ return iterator(_Base::end(), this); }
|
|
|
|
const_iterator
|
|
end() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
reverse_iterator
|
|
rbegin()
|
|
{ return reverse_iterator(end()); }
|
|
|
|
const_reverse_iterator
|
|
rbegin() const
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
reverse_iterator
|
|
rend()
|
|
{ return reverse_iterator(begin()); }
|
|
|
|
const_reverse_iterator
|
|
rend() const
|
|
{ return const_reverse_iterator(begin()); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
const_iterator
|
|
cbegin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
cend() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
const_reverse_iterator
|
|
crbegin() const
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
const_reverse_iterator
|
|
crend() const
|
|
{ return const_reverse_iterator(begin()); }
|
|
#endif
|
|
|
|
// 23.2.4.2 capacity:
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
|
|
void
|
|
resize(size_type __sz, _Tp __c = _Tp())
|
|
{
|
|
bool __realloc = _M_requires_reallocation(__sz);
|
|
if (__sz < this->size())
|
|
this->_M_invalidate_if(_After_nth(__sz, _M_base().begin()));
|
|
_Base::resize(__sz, __c);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
}
|
|
|
|
using _Base::capacity;
|
|
using _Base::empty;
|
|
|
|
void
|
|
reserve(size_type __n)
|
|
{
|
|
bool __realloc = _M_requires_reallocation(__n);
|
|
_Base::reserve(__n);
|
|
if (__n > _M_guaranteed_capacity)
|
|
_M_guaranteed_capacity = __n;
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
}
|
|
|
|
// element access:
|
|
reference
|
|
operator[](size_type __n)
|
|
{
|
|
__glibcxx_check_subscript(__n);
|
|
return _M_base()[__n];
|
|
}
|
|
|
|
const_reference
|
|
operator[](size_type __n) const
|
|
{
|
|
__glibcxx_check_subscript(__n);
|
|
return _M_base()[__n];
|
|
}
|
|
|
|
using _Base::at;
|
|
|
|
reference
|
|
front()
|
|
{
|
|
__glibcxx_check_nonempty();
|
|
return _Base::front();
|
|
}
|
|
|
|
const_reference
|
|
front() const
|
|
{
|
|
__glibcxx_check_nonempty();
|
|
return _Base::front();
|
|
}
|
|
|
|
reference
|
|
back()
|
|
{
|
|
__glibcxx_check_nonempty();
|
|
return _Base::back();
|
|
}
|
|
|
|
const_reference
|
|
back() const
|
|
{
|
|
__glibcxx_check_nonempty();
|
|
return _Base::back();
|
|
}
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// DR 464. Suggestion for new member functions in standard containers.
|
|
using _Base::data;
|
|
|
|
// 23.2.4.3 modifiers:
|
|
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
push_back(const _Tp& __x)
|
|
{
|
|
bool __realloc = _M_requires_reallocation(this->size() + 1);
|
|
_Base::push_back(__x);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
#else
|
|
template<typename... _Args>
|
|
void
|
|
push_back(_Args&&... __args)
|
|
{
|
|
bool __realloc = _M_requires_reallocation(this->size() + 1);
|
|
_Base::push_back(std::forward<_Args>(__args)...);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
#endif
|
|
|
|
void
|
|
pop_back()
|
|
{
|
|
__glibcxx_check_nonempty();
|
|
iterator __victim = end() - 1;
|
|
__victim._M_invalidate();
|
|
_Base::pop_back();
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename... _Args>
|
|
iterator
|
|
emplace(iterator __position, _Args&&... __args)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
bool __realloc = _M_requires_reallocation(this->size() + 1);
|
|
difference_type __offset = __position - begin();
|
|
typename _Base::iterator __res = _Base::emplace(__position.base(),
|
|
std::forward<_Args>(__args)...);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
else
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
_M_update_guaranteed_capacity();
|
|
return iterator(__res, this);
|
|
}
|
|
#endif
|
|
|
|
iterator
|
|
insert(iterator __position, const _Tp& __x)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
bool __realloc = _M_requires_reallocation(this->size() + 1);
|
|
difference_type __offset = __position - begin();
|
|
typename _Base::iterator __res = _Base::insert(__position.base(),__x);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
else
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
_M_update_guaranteed_capacity();
|
|
return iterator(__res, this);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
insert(iterator __position, _Tp&& __x)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
bool __realloc = _M_requires_reallocation(this->size() + 1);
|
|
difference_type __offset = __position - begin();
|
|
typename _Base::iterator __res = _Base::insert(__position.base(),
|
|
std::forward<_Tp>(__x));
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
else
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
_M_update_guaranteed_capacity();
|
|
return iterator(__res, this);
|
|
}
|
|
#endif
|
|
|
|
void
|
|
insert(iterator __position, size_type __n, const _Tp& __x)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
bool __realloc = _M_requires_reallocation(this->size() + __n);
|
|
difference_type __offset = __position - begin();
|
|
_Base::insert(__position.base(), __n, __x);
|
|
if (__realloc)
|
|
this->_M_invalidate_all();
|
|
else
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
|
|
template<class _InputIterator>
|
|
void
|
|
insert(iterator __position,
|
|
_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_insert_range(__position, __first, __last);
|
|
|
|
/* Hard to guess if invalidation will occur, because __last
|
|
- __first can't be calculated in all cases, so we just
|
|
punt here by checking if it did occur. */
|
|
typename _Base::iterator __old_begin = _M_base().begin();
|
|
difference_type __offset = __position - begin();
|
|
_Base::insert(__position.base(), __first, __last);
|
|
|
|
if (_M_base().begin() != __old_begin)
|
|
this->_M_invalidate_all();
|
|
else
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
_M_update_guaranteed_capacity();
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __position)
|
|
{
|
|
__glibcxx_check_erase(__position);
|
|
difference_type __offset = __position - begin();
|
|
typename _Base::iterator __res = _Base::erase(__position.base());
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
return iterator(__res, this);
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 151. can't currently clear() empty container
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
|
|
difference_type __offset = __first - begin();
|
|
typename _Base::iterator __res = _Base::erase(__first.base(),
|
|
__last.base());
|
|
this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
|
|
return iterator(__res, this);
|
|
}
|
|
|
|
void
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
swap(vector&& __x)
|
|
#else
|
|
swap(vector& __x)
|
|
#endif
|
|
{
|
|
_Base::swap(__x);
|
|
this->_M_swap(__x);
|
|
std::swap(_M_guaranteed_capacity, __x._M_guaranteed_capacity);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{
|
|
_Base::clear();
|
|
this->_M_invalidate_all();
|
|
_M_guaranteed_capacity = 0;
|
|
}
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
|
|
private:
|
|
size_type _M_guaranteed_capacity;
|
|
|
|
bool
|
|
_M_requires_reallocation(size_type __elements)
|
|
{
|
|
#ifdef _GLIBCXX_DEBUG_PEDANTIC
|
|
return __elements > this->capacity();
|
|
#else
|
|
return __elements > _M_guaranteed_capacity;
|
|
#endif
|
|
}
|
|
|
|
void
|
|
_M_update_guaranteed_capacity()
|
|
{
|
|
if (this->size() > _M_guaranteed_capacity)
|
|
_M_guaranteed_capacity = this->size();
|
|
}
|
|
};
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator==(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() == __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator!=(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() != __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator<(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() < __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator<=(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() <= __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator>=(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() >= __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator>(const vector<_Tp, _Alloc>& __lhs,
|
|
const vector<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() > __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline void
|
|
swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename _Tp, typename _Alloc>
|
|
inline void
|
|
swap(vector<_Tp, _Alloc>&& __lhs, vector<_Tp, _Alloc>& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline void
|
|
swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>&& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
#endif
|
|
|
|
} // namespace __debug
|
|
} // namespace std
|
|
|
|
#endif
|