2009-10-03 10:17:41 +08:00
|
|
|
// Profiling set implementation -*- C++ -*-
|
|
|
|
|
2011-05-26 23:35:02 +08:00
|
|
|
// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
|
2009-10-03 10:17:41 +08:00
|
|
|
//
|
|
|
|
// 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/set.h
|
|
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _GLIBCXX_PROFILE_SET_H
|
|
|
|
#define _GLIBCXX_PROFILE_SET_H 1
|
|
|
|
|
|
|
|
#include <utility>
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-31 06:39:36 +08:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
2009-10-03 10:17:41 +08:00
|
|
|
{
|
|
|
|
namespace __profile
|
|
|
|
{
|
2009-11-18 04:45:32 +08:00
|
|
|
/// Class std::set wrapper with performance instrumentation.
|
2009-10-03 10:17:41 +08:00
|
|
|
template<typename _Key, typename _Compare = std::less<_Key>,
|
|
|
|
typename _Allocator = std::allocator<_Key> >
|
|
|
|
class set
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-31 06:39:36 +08:00
|
|
|
: public _GLIBCXX_STD_C::set<_Key,_Compare,_Allocator>
|
2009-10-03 10:17:41 +08:00
|
|
|
{
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-31 06:39:36 +08:00
|
|
|
typedef _GLIBCXX_STD_C::set<_Key, _Compare, _Allocator> _Base;
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
public:
|
|
|
|
// types:
|
|
|
|
typedef _Key key_type;
|
|
|
|
typedef _Key value_type;
|
|
|
|
typedef _Compare key_compare;
|
|
|
|
typedef _Compare value_compare;
|
|
|
|
typedef _Allocator allocator_type;
|
|
|
|
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 typename _Base::pointer pointer;
|
|
|
|
typedef typename _Base::const_pointer const_pointer;
|
|
|
|
|
|
|
|
// 23.3.3.1 construct/copy/destroy:
|
|
|
|
explicit set(const _Compare& __comp = _Compare(),
|
|
|
|
const _Allocator& __a = _Allocator())
|
|
|
|
: _Base(__comp, __a) { }
|
|
|
|
|
|
|
|
template<typename _InputIterator>
|
|
|
|
set(_InputIterator __first, _InputIterator __last,
|
|
|
|
const _Compare& __comp = _Compare(),
|
|
|
|
const _Allocator& __a = _Allocator())
|
|
|
|
: _Base(__first, __last, __comp, __a) { }
|
|
|
|
|
|
|
|
set(const set& __x)
|
|
|
|
: _Base(__x) { }
|
|
|
|
|
|
|
|
set(const _Base& __x)
|
|
|
|
: _Base(__x) { }
|
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
set(set&& __x)
|
2011-06-01 22:16:19 +08:00
|
|
|
noexcept(is_nothrow_copy_constructible<_Compare>::value)
|
2010-08-05 15:34:08 +08:00
|
|
|
: _Base(std::move(__x))
|
2009-10-03 10:17:41 +08:00
|
|
|
{ }
|
|
|
|
|
|
|
|
set(initializer_list<value_type> __l,
|
|
|
|
const _Compare& __comp = _Compare(),
|
|
|
|
const allocator_type& __a = allocator_type())
|
|
|
|
: _Base(__l, __comp, __a) { }
|
|
|
|
#endif
|
|
|
|
|
2011-06-01 22:16:19 +08:00
|
|
|
~set() _GLIBCXX_NOEXCEPT { }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
set&
|
|
|
|
operator=(const set& __x)
|
|
|
|
{
|
|
|
|
*static_cast<_Base*>(this) = __x;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
set&
|
|
|
|
operator=(set&& __x)
|
|
|
|
{
|
2010-01-09 19:16:42 +08:00
|
|
|
// NB: DR 1204.
|
|
|
|
// NB: DR 675.
|
|
|
|
this->clear();
|
|
|
|
this->swap(__x);
|
2009-10-03 10:17:41 +08:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
set&
|
|
|
|
operator=(initializer_list<value_type> __l)
|
|
|
|
{
|
|
|
|
this->clear();
|
|
|
|
this->insert(__l);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
using _Base::get_allocator;
|
|
|
|
|
|
|
|
// iterators:
|
|
|
|
iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
begin() _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return iterator(_Base::begin()); }
|
|
|
|
|
|
|
|
const_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
begin() const _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_iterator(_Base::begin()); }
|
|
|
|
|
|
|
|
iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
end() _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return iterator(_Base::end()); }
|
|
|
|
|
|
|
|
const_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
end() const _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_iterator(_Base::end()); }
|
|
|
|
|
|
|
|
reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
rbegin() _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return reverse_iterator(end()); }
|
|
|
|
|
|
|
|
const_reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
rbegin() const _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
|
|
|
|
reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
rend() _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return reverse_iterator(begin()); }
|
|
|
|
|
|
|
|
const_reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
rend() const _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_reverse_iterator(begin()); }
|
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
const_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
cbegin() const noexcept
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_iterator(_Base::begin()); }
|
|
|
|
|
|
|
|
const_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
cend() const noexcept
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_iterator(_Base::end()); }
|
|
|
|
|
|
|
|
const_reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
crbegin() const noexcept
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_reverse_iterator(end()); }
|
|
|
|
|
|
|
|
const_reverse_iterator
|
2011-05-26 23:35:02 +08:00
|
|
|
crend() const noexcept
|
2009-10-03 10:17:41 +08:00
|
|
|
{ return const_reverse_iterator(begin()); }
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// capacity:
|
|
|
|
using _Base::empty;
|
|
|
|
using _Base::size;
|
|
|
|
using _Base::max_size;
|
|
|
|
|
|
|
|
// modifiers:
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(const value_type& __x)
|
|
|
|
{
|
|
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
|
|
std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
|
|
|
|
return std::pair<iterator, bool>(iterator(__res.first),
|
|
|
|
__res.second);
|
|
|
|
}
|
|
|
|
|
PR libstdc++/44436 (partial)
2010-11-10 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/44436 (partial)
PR libstdc++/46148
* include/bits/stl_tree.h (_Rb_tree<>::_M_insert_, _M_insert_lower,
_M_insert_equal_lower, _M_insert_unique, _M_insert_equal,
_M_insert_unique_, _M_insert_equal_): Templatize in C++0x mode,
use _GLIBCXX_FORWARD throughout.
* include/bits/stl_map.h (map<>::insert(_Pair&&),
insert(const_iterator, _Pair&&), operator[](key_type&&): Add.
* include/bits/stl_set.h (set<>::insert(value_type&&),
insert(const_iterator, value_type&&)): Likewise.
* include/bits/stl_multimap.h (multimap<>::insert(_Pair&&),
insert(const_iterator, _Pair&&)): Likewise.
* include/bits/stl_multiset.h (multiset<>::insert(value_type&&),
insert(const_iterator, value_type&&)): Likewise.
* include/debug/set.h: Adjust.
* include/debug/multiset.h: Likewise.
* include/debug/map.h: Likewise.
* include/debug/multimap.h: Likewise.
* include/profile/set.h: Likewise.
* include/profile/multiset.h: Likewise.
* include/profile/map.h: Likewise.
* include/profile/multimap.h: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/1.cc: New.
* testsuite/23_containers/multimap/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/set/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/set/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/5.cc: Likewise.
* testsuite/23_containers/map/element_access/2.cc: Likewise.
* testsuite/23_containers/map/element_access/46148.cc: Likewise.
* include/bits/hashtable.h: Trivial naming changes.
From-SVN: r166551
2010-11-11 03:08:49 +08:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
std::pair<iterator, bool>
|
|
|
|
insert(value_type&& __x)
|
|
|
|
{
|
|
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
|
|
std::pair<_Base_iterator, bool> __res
|
|
|
|
= _Base::insert(std::move(__x));
|
|
|
|
return std::pair<iterator, bool>(iterator(__res.first),
|
|
|
|
__res.second);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-10-03 10:17:41 +08:00
|
|
|
iterator
|
2010-11-09 00:07:32 +08:00
|
|
|
insert(const_iterator __position, const value_type& __x)
|
|
|
|
{ return iterator(_Base::insert(__position, __x)); }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
PR libstdc++/44436 (partial)
2010-11-10 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/44436 (partial)
PR libstdc++/46148
* include/bits/stl_tree.h (_Rb_tree<>::_M_insert_, _M_insert_lower,
_M_insert_equal_lower, _M_insert_unique, _M_insert_equal,
_M_insert_unique_, _M_insert_equal_): Templatize in C++0x mode,
use _GLIBCXX_FORWARD throughout.
* include/bits/stl_map.h (map<>::insert(_Pair&&),
insert(const_iterator, _Pair&&), operator[](key_type&&): Add.
* include/bits/stl_set.h (set<>::insert(value_type&&),
insert(const_iterator, value_type&&)): Likewise.
* include/bits/stl_multimap.h (multimap<>::insert(_Pair&&),
insert(const_iterator, _Pair&&)): Likewise.
* include/bits/stl_multiset.h (multiset<>::insert(value_type&&),
insert(const_iterator, value_type&&)): Likewise.
* include/debug/set.h: Adjust.
* include/debug/multiset.h: Likewise.
* include/debug/map.h: Likewise.
* include/debug/multimap.h: Likewise.
* include/profile/set.h: Likewise.
* include/profile/multiset.h: Likewise.
* include/profile/map.h: Likewise.
* include/profile/multimap.h: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/1.cc: New.
* testsuite/23_containers/multimap/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multimap/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/set/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/set/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/multiset/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/2.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/3.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/4.cc: Likewise.
* testsuite/23_containers/map/modifiers/insert/5.cc: Likewise.
* testsuite/23_containers/map/element_access/2.cc: Likewise.
* testsuite/23_containers/map/element_access/46148.cc: Likewise.
* include/bits/hashtable.h: Trivial naming changes.
From-SVN: r166551
2010-11-11 03:08:49 +08:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
iterator
|
|
|
|
insert(const_iterator __position, value_type&& __x)
|
|
|
|
{ return iterator(_Base::insert(__position, std::move(__x))); }
|
|
|
|
#endif
|
|
|
|
|
2009-10-03 10:17:41 +08:00
|
|
|
template <typename _InputIterator>
|
|
|
|
void
|
|
|
|
insert(_InputIterator __first, _InputIterator __last)
|
2010-11-09 00:07:32 +08:00
|
|
|
{ _Base::insert(__first, __last); }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
void
|
|
|
|
insert(initializer_list<value_type> __l)
|
|
|
|
{ _Base::insert(__l); }
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
iterator
|
2010-11-09 00:07:32 +08:00
|
|
|
erase(const_iterator __position)
|
|
|
|
{ return iterator(_Base::erase(__position)); }
|
2009-10-03 10:17:41 +08:00
|
|
|
#else
|
|
|
|
void
|
|
|
|
erase(iterator __position)
|
2010-01-04 04:30:28 +08:00
|
|
|
{ _Base::erase(__position); }
|
2009-10-03 10:17:41 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
size_type
|
|
|
|
erase(const key_type& __x)
|
|
|
|
{
|
|
|
|
iterator __victim = find(__x);
|
|
|
|
if (__victim == end())
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_Base::erase(__victim);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-01-04 04:30:28 +08:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
iterator
|
2010-11-09 00:07:32 +08:00
|
|
|
erase(const_iterator __first, const_iterator __last)
|
|
|
|
{ return iterator(_Base::erase(__first, __last)); }
|
2010-01-04 04:30:28 +08:00
|
|
|
#else
|
2009-10-03 10:17:41 +08:00
|
|
|
void
|
|
|
|
erase(iterator __first, iterator __last)
|
2010-11-09 00:07:32 +08:00
|
|
|
{ _Base::erase(__first, __last); }
|
2010-01-04 04:30:28 +08:00
|
|
|
#endif
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
void
|
|
|
|
swap(set& __x)
|
2010-11-09 00:07:32 +08:00
|
|
|
{ _Base::swap(__x); }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
void
|
2011-05-26 23:35:02 +08:00
|
|
|
clear() _GLIBCXX_NOEXCEPT
|
2009-10-03 10:17:41 +08:00
|
|
|
{ this->erase(begin(), end()); }
|
|
|
|
|
|
|
|
// observers:
|
|
|
|
using _Base::key_comp;
|
|
|
|
using _Base::value_comp;
|
|
|
|
|
|
|
|
// set operations:
|
|
|
|
iterator
|
|
|
|
find(const key_type& __x)
|
|
|
|
{ return iterator(_Base::find(__x)); }
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 214. set::find() missing const overload
|
|
|
|
const_iterator
|
|
|
|
find(const key_type& __x) const
|
|
|
|
{ return const_iterator(_Base::find(__x)); }
|
|
|
|
|
|
|
|
using _Base::count;
|
|
|
|
|
|
|
|
iterator
|
|
|
|
lower_bound(const key_type& __x)
|
|
|
|
{ return iterator(_Base::lower_bound(__x)); }
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 214. set::find() missing const overload
|
|
|
|
const_iterator
|
|
|
|
lower_bound(const key_type& __x) const
|
|
|
|
{ return const_iterator(_Base::lower_bound(__x)); }
|
|
|
|
|
|
|
|
iterator
|
|
|
|
upper_bound(const key_type& __x)
|
|
|
|
{ return iterator(_Base::upper_bound(__x)); }
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 214. set::find() missing const overload
|
|
|
|
const_iterator
|
|
|
|
upper_bound(const key_type& __x) const
|
|
|
|
{ return const_iterator(_Base::upper_bound(__x)); }
|
|
|
|
|
|
|
|
std::pair<iterator,iterator>
|
|
|
|
equal_range(const key_type& __x)
|
|
|
|
{
|
|
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
|
|
std::pair<_Base_iterator, _Base_iterator> __res =
|
|
|
|
_Base::equal_range(__x);
|
|
|
|
return std::make_pair(iterator(__res.first),
|
|
|
|
iterator(__res.second));
|
|
|
|
}
|
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 214. set::find() missing const overload
|
|
|
|
std::pair<const_iterator,const_iterator>
|
|
|
|
equal_range(const key_type& __x) const
|
|
|
|
{
|
|
|
|
typedef typename _Base::const_iterator _Base_iterator;
|
|
|
|
std::pair<_Base_iterator, _Base_iterator> __res =
|
|
|
|
_Base::equal_range(__x);
|
|
|
|
return std::make_pair(const_iterator(__res.first),
|
|
|
|
const_iterator(__res.second));
|
|
|
|
}
|
|
|
|
|
|
|
|
_Base&
|
2011-05-26 23:35:02 +08:00
|
|
|
_M_base() _GLIBCXX_NOEXCEPT { return *this; }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
const _Base&
|
2011-05-26 23:35:02 +08:00
|
|
|
_M_base() const _GLIBCXX_NOEXCEPT { return *this; }
|
2009-10-03 10:17:41 +08:00
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator==(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() == __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator!=(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() != __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator<(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() < __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator<=(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() <= __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator>=(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() >= __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
inline bool
|
|
|
|
operator>(const set<_Key, _Compare, _Allocator>& __lhs,
|
|
|
|
const set<_Key, _Compare, _Allocator>& __rhs)
|
|
|
|
{ return __lhs._M_base() > __rhs._M_base(); }
|
|
|
|
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
|
|
void
|
|
|
|
swap(set<_Key, _Compare, _Allocator>& __x,
|
|
|
|
set<_Key, _Compare, _Allocator>& __y)
|
|
|
|
{ return __x.swap(__y); }
|
|
|
|
|
|
|
|
} // namespace __profile
|
|
|
|
} // namespace std
|
|
|
|
|
|
|
|
#endif
|