dc2cf706b8
2010-06-18 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/32618 * include/bits/stl_list.h (vector<>::_M_default_initialize, _M_default_append): Declare. (list<>::list(size_type), resize(size_type)): Add in C++0x mode, use the latter. * include/bits/list.tcc (list<>::resize, _M_default_append): Define. * include/bits/stl_vector.h (vector<>::_M_default_initialize, _M_default_append): Declare. (vector<>::vector(size_type), resize(size_type)): Add in C++0x mode, use the latter. * include/bits/vector.tcc (vector<>::_M_default_append): Define. * include/bits/stl_deque.h (deque<>::_M_default_initialize, _M_default_append): Declare. (deque<>::deque(size_type), resize(size_type)): Add in C++0x mode, use the latter. * include/bits/deque.tcc (deque<>::_M_default_append): Define. * include/debug/vector: Update. * include/debug/deque: Likewise. * include/debug/list: Likewise. * include/profile/vector: Likewise. * include/profile/deque: Likewise. * include/profile/list: Likewise. * include/bits/forward_list.h (_M_default_initialize, _M_default_insert_after): Declare. (forward_list<>::forward_list(size_type), resize(size_type)): Fix, use the latter. * include/bits/forward_list.tcc (forward_list<>::_M_default_append, _M_default_insert_after): Define. * testsuite/util/testsuite_api.h (NonCopyConstructible): Add. * testsuite/23_containers/forward_list/modifiers/6.cc: Move to... * testsuite/23_containers/forward_list/capacity/resize_size.cc: ... here. * testsuite/23_containers/forward_list/cons/10.cc: Move to... * testsuite/23_containers/forward_list/cons/cons_size.cc: ... here. * testsuite/23_containers/vector/resize/1.cc: Move to... * testsuite/23_containers/vector/capacity/resize/1.cc: ... here. * testsuite/23_containers/vector/resize/moveable.cc: Move to... * testsuite/23_containers/vector/resize/capacity/moveable.cc: ... here. * testsuite/23_containers/vector/cons/cons_size.cc: New. * testsuite/23_containers/vector/capacity/resize/resize_size.cc: Likewise. * testsuite/23_containers/deque/cons/cons_size.cc: Likewise. * testsuite/23_containers/deque/capacity/resize_size.cc: Likewise. * testsuite/23_containers/list/cons/cons_size.cc: Likewise. * testsuite/23_containers/list/capacity/resize_size.cc: Likewise. * testsuite/23_containers/vector/capacity/resize/moveable.cc: Adjust. * testsuite/23_containers/deque/capacity/moveable.cc: Likewise. * testsuite/23_containers/forward_list/requirements/dr438/ assign_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Likewise. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/forward_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. * testsuite/23_containers/deque/requirements/dr438/ assign_neg.cc: Likewise. * 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. From-SVN: r161009
452 lines
10 KiB
C++
452 lines
10 KiB
C++
// Profiling deque implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2009, 2010 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file profile/deque
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PROFILE_DEQUE
|
|
#define _GLIBCXX_PROFILE_DEQUE 1
|
|
|
|
#include <deque>
|
|
|
|
namespace std
|
|
{
|
|
namespace __profile
|
|
{
|
|
/// Class std::deque wrapper with performance instrumentation.
|
|
template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
|
|
class deque
|
|
: public _GLIBCXX_STD_D::deque<_Tp, _Allocator>
|
|
{
|
|
typedef _GLIBCXX_STD_D::deque<_Tp, _Allocator> _Base;
|
|
|
|
public:
|
|
typedef typename _Base::reference reference;
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
typedef typename _Base::iterator iterator;
|
|
typedef typename _Base::const_iterator const_iterator;
|
|
typedef typename _Base::reverse_iterator reverse_iterator;
|
|
typedef typename _Base::const_reverse_iterator const_reverse_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;
|
|
|
|
// 23.2.1.1 construct/copy/destroy:
|
|
explicit
|
|
deque(const _Allocator& __a = _Allocator())
|
|
: _Base(__a) { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
explicit
|
|
deque(size_type __n)
|
|
: _Base(__n) { }
|
|
|
|
deque(size_type __n, const _Tp& __value,
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__n, __value, __a) { }
|
|
#else
|
|
explicit
|
|
deque(size_type __n, const _Tp& __value = _Tp(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__n, __value, __a) { }
|
|
#endif
|
|
|
|
template<class _InputIterator>
|
|
deque(_InputIterator __first, _InputIterator __last,
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__first, __last, __a)
|
|
{ }
|
|
|
|
deque(const deque& __x)
|
|
: _Base(__x) { }
|
|
|
|
deque(const _Base& __x)
|
|
: _Base(__x) { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
deque(deque&& __x)
|
|
: _Base(std::forward<deque>(__x))
|
|
{ }
|
|
|
|
deque(initializer_list<value_type> __l,
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__l, __a) { }
|
|
#endif
|
|
|
|
~deque() { }
|
|
|
|
deque&
|
|
operator=(const deque& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
return *this;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
deque&
|
|
operator=(deque&& __x)
|
|
{
|
|
// NB: DR 1204.
|
|
// NB: DR 675.
|
|
this->clear();
|
|
this->swap(__x);
|
|
return *this;
|
|
}
|
|
|
|
deque&
|
|
operator=(initializer_list<value_type> __l)
|
|
{
|
|
*static_cast<_Base*>(this) = __l;
|
|
return *this;
|
|
}
|
|
#endif
|
|
|
|
template<class _InputIterator>
|
|
void
|
|
assign(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
_Base::assign(__first, __last);
|
|
}
|
|
|
|
void
|
|
assign(size_type __n, const _Tp& __t)
|
|
{
|
|
_Base::assign(__n, __t);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
assign(initializer_list<value_type> __l)
|
|
{
|
|
_Base::assign(__l);
|
|
}
|
|
#endif
|
|
|
|
using _Base::get_allocator;
|
|
|
|
// iterators:
|
|
iterator
|
|
begin()
|
|
{ return iterator(_Base::begin()); }
|
|
|
|
const_iterator
|
|
begin() const
|
|
{ return const_iterator(_Base::begin()); }
|
|
|
|
iterator
|
|
end()
|
|
{ return iterator(_Base::end()); }
|
|
|
|
const_iterator
|
|
end() const
|
|
{ return const_iterator(_Base::end()); }
|
|
|
|
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()); }
|
|
|
|
const_iterator
|
|
cend() const
|
|
{ return const_iterator(_Base::end()); }
|
|
|
|
const_reverse_iterator
|
|
crbegin() const
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
const_reverse_iterator
|
|
crend() const
|
|
{ return const_reverse_iterator(begin()); }
|
|
#endif
|
|
|
|
// 23.2.1.2 capacity:
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
resize(size_type __sz)
|
|
{
|
|
_Base::resize(__sz);
|
|
}
|
|
|
|
void
|
|
resize(size_type __sz, const _Tp& __c)
|
|
{
|
|
_Base::resize(__sz, __c);
|
|
}
|
|
#else
|
|
void
|
|
resize(size_type __sz, _Tp __c = _Tp())
|
|
{
|
|
_Base::resize(__sz, __c);
|
|
}
|
|
#endif
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
using _Base::shrink_to_fit;
|
|
#endif
|
|
|
|
using _Base::empty;
|
|
|
|
// element access:
|
|
reference
|
|
operator[](size_type __n)
|
|
{
|
|
return _M_base()[__n];
|
|
}
|
|
|
|
const_reference
|
|
operator[](size_type __n) const
|
|
{
|
|
return _M_base()[__n];
|
|
}
|
|
|
|
using _Base::at;
|
|
|
|
reference
|
|
front()
|
|
{
|
|
return _Base::front();
|
|
}
|
|
|
|
const_reference
|
|
front() const
|
|
{
|
|
return _Base::front();
|
|
}
|
|
|
|
reference
|
|
back()
|
|
{
|
|
return _Base::back();
|
|
}
|
|
|
|
const_reference
|
|
back() const
|
|
{
|
|
return _Base::back();
|
|
}
|
|
|
|
// 23.2.1.3 modifiers:
|
|
void
|
|
push_front(const _Tp& __x)
|
|
{
|
|
_Base::push_front(__x);
|
|
}
|
|
|
|
void
|
|
push_back(const _Tp& __x)
|
|
{
|
|
_Base::push_back(__x);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
push_front(_Tp&& __x)
|
|
{ emplace_front(std::move(__x)); }
|
|
|
|
void
|
|
push_back(_Tp&& __x)
|
|
{ emplace_back(std::move(__x)); }
|
|
|
|
template<typename... _Args>
|
|
void
|
|
emplace_front(_Args&&... __args)
|
|
{
|
|
_Base::emplace_front(std::forward<_Args>(__args)...);
|
|
}
|
|
|
|
template<typename... _Args>
|
|
void
|
|
emplace_back(_Args&&... __args)
|
|
{
|
|
_Base::emplace_back(std::forward<_Args>(__args)...);
|
|
}
|
|
|
|
template<typename... _Args>
|
|
iterator
|
|
emplace(iterator __position, _Args&&... __args)
|
|
{
|
|
typename _Base::iterator __res = _Base::emplace(__position,
|
|
std::forward<_Args>(__args)...);
|
|
return iterator(__res);
|
|
}
|
|
#endif
|
|
|
|
iterator
|
|
insert(iterator __position, const _Tp& __x)
|
|
{
|
|
typename _Base::iterator __res = _Base::insert(__position, __x);
|
|
return iterator(__res);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
insert(iterator __position, _Tp&& __x)
|
|
{ return emplace(__position, std::move(__x)); }
|
|
|
|
void
|
|
insert(iterator __p, initializer_list<value_type> __l)
|
|
{
|
|
_Base::insert(__p, __l);
|
|
}
|
|
#endif
|
|
|
|
void
|
|
insert(iterator __position, size_type __n, const _Tp& __x)
|
|
{
|
|
_Base::insert(__position, __n, __x);
|
|
}
|
|
|
|
template<class _InputIterator>
|
|
void
|
|
insert(iterator __position,
|
|
_InputIterator __first, _InputIterator __last)
|
|
{
|
|
_Base::insert(__position, __first, __last);
|
|
}
|
|
|
|
void
|
|
pop_front()
|
|
{
|
|
_Base::pop_front();
|
|
}
|
|
|
|
void
|
|
pop_back()
|
|
{
|
|
_Base::pop_back();
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __position)
|
|
{
|
|
if (__position == begin() || __position == end()-1)
|
|
{
|
|
return iterator(_Base::erase(__position));
|
|
}
|
|
else
|
|
{
|
|
typename _Base::iterator __res = _Base::erase(__position);
|
|
return iterator(__res);
|
|
}
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 151. can't currently clear() empty container
|
|
return iterator(_Base::erase(__first, __last));
|
|
}
|
|
|
|
void
|
|
swap(deque& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{
|
|
_Base::clear();
|
|
}
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
};
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator==(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() == __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator!=(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() != __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator<(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() < __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator<=(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() <= __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator>=(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() >= __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline bool
|
|
operator>(const deque<_Tp, _Alloc>& __lhs,
|
|
const deque<_Tp, _Alloc>& __rhs)
|
|
{ return __lhs._M_base() > __rhs._M_base(); }
|
|
|
|
template<typename _Tp, typename _Alloc>
|
|
inline void
|
|
swap(deque<_Tp, _Alloc>& __lhs, deque<_Tp, _Alloc>& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
} // namespace __profile
|
|
} // namespace std
|
|
|
|
#endif
|