12ffa22844
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
368 lines
10 KiB
C++
368 lines
10 KiB
C++
// Profiling multiset 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/multiset.h
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PROFILE_MULTISET_H
|
|
#define _GLIBCXX_PROFILE_MULTISET_H 1
|
|
|
|
#include <utility>
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
namespace __profile
|
|
{
|
|
/// Class std::multiset wrapper with performance instrumentation.
|
|
template<typename _Key, typename _Compare = std::less<_Key>,
|
|
typename _Allocator = std::allocator<_Key> >
|
|
class multiset
|
|
: public _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator>
|
|
{
|
|
typedef _GLIBCXX_STD_C::multiset<_Key, _Compare, _Allocator> _Base;
|
|
|
|
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 multiset(const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__comp, __a) { }
|
|
|
|
template<typename _InputIterator>
|
|
multiset(_InputIterator __first, _InputIterator __last,
|
|
const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__first, __last, __comp, __a) { }
|
|
|
|
multiset(const multiset& __x)
|
|
: _Base(__x) { }
|
|
|
|
multiset(const _Base& __x)
|
|
: _Base(__x) { }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
multiset(multiset&& __x)
|
|
: _Base(std::move(__x))
|
|
{ }
|
|
|
|
multiset(initializer_list<value_type> __l,
|
|
const _Compare& __comp = _Compare(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__l, __comp, __a) { }
|
|
#endif
|
|
|
|
~multiset() { }
|
|
|
|
multiset&
|
|
operator=(const multiset& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
return *this;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
multiset&
|
|
operator=(multiset&& __x)
|
|
{
|
|
// NB: DR 1204.
|
|
// NB: DR 675.
|
|
this->clear();
|
|
this->swap(__x);
|
|
return *this;
|
|
}
|
|
|
|
multiset&
|
|
operator=(initializer_list<value_type> __l)
|
|
{
|
|
this->clear();
|
|
this->insert(__l);
|
|
return *this;
|
|
}
|
|
#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
|
|
|
|
// capacity:
|
|
using _Base::empty;
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
|
|
// modifiers:
|
|
iterator
|
|
insert(const value_type& __x)
|
|
{ return iterator(_Base::insert(__x)); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
insert(value_type&& __x)
|
|
{ return iterator(_Base::insert(std::move(__x))); }
|
|
#endif
|
|
|
|
iterator
|
|
insert(const_iterator __position, const value_type& __x)
|
|
{ return iterator(_Base::insert(__position, __x)); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
insert(const_iterator __position, value_type&& __x)
|
|
{ return iterator(_Base::insert(__position, std::move(__x))); }
|
|
#endif
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{ _Base::insert(__first, __last); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
insert(initializer_list<value_type> __l)
|
|
{ _Base::insert(__l); }
|
|
#endif
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
erase(const_iterator __position)
|
|
{ return iterator(_Base::erase(__position)); }
|
|
#else
|
|
void
|
|
erase(iterator __position)
|
|
{ _Base::erase(__position); }
|
|
#endif
|
|
|
|
size_type
|
|
erase(const key_type& __x)
|
|
{
|
|
std::pair<iterator, iterator> __victims = this->equal_range(__x);
|
|
size_type __count = 0;
|
|
while (__victims.first != __victims.second)
|
|
{
|
|
iterator __victim = __victims.first++;
|
|
_Base::erase(__victim);
|
|
++__count;
|
|
}
|
|
return __count;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
erase(const_iterator __first, const_iterator __last)
|
|
{ return iterator(_Base::erase(__first, __last)); }
|
|
#else
|
|
void
|
|
erase(iterator __first, iterator __last)
|
|
{ _Base::erase(__first, __last); }
|
|
#endif
|
|
|
|
void
|
|
swap(multiset& __x)
|
|
{ _Base::swap(__x); }
|
|
|
|
void
|
|
clear()
|
|
{ this->erase(begin(), end()); }
|
|
|
|
// observers:
|
|
using _Base::key_comp;
|
|
using _Base::value_comp;
|
|
|
|
// multiset 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&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
|
|
};
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator==(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() == __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator!=(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() != __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator<(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() < __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator<=(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() <= __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator>=(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() >= __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator>(const multiset<_Key, _Compare, _Allocator>& __lhs,
|
|
const multiset<_Key, _Compare, _Allocator>& __rhs)
|
|
{ return __lhs._M_base() > __rhs._M_base(); }
|
|
|
|
template<typename _Key, typename _Compare, typename _Allocator>
|
|
void
|
|
swap(multiset<_Key, _Compare, _Allocator>& __x,
|
|
multiset<_Key, _Compare, _Allocator>& __y)
|
|
{ return __x.swap(__y); }
|
|
|
|
} // namespace __profile
|
|
} // namespace std
|
|
|
|
#endif
|