6dc88283f6
2011-11-15 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/51142 * include/debug/unordered_map (unordered_map<>::erase(iterator), unordered_multimap<>::erase(iterator)): Add, consistently with LWG 2059. * include/debug/unordered_set (unordered_set<>::erase(iterator), unordered_multiset<>::erase(iterator)): Likewise. * include/debug/map.h (map<>::erase(iterator)): Likewise. * include/debug/multimap.h (multimap<>::erase(iterator)): Likewise. * include/profile/map.h (map<>::erase(iterator)): Likewise. * include/profile/multimap.h (multimap<>::erase(iterator)): Likewise. * include/bits/hashtable.h (_Hashtable<>::erase(iterator)): Likewise. * include/bits/stl_map.h (map<>::erase(iterator)): Likewise. * include/bits/stl_multimap.h (multimap<>::erase(iterator)): Likewise. * include/bits/stl_tree.h (_Rb_tree<>::erase(iterator)): Likewise. * testsuite/23_containers/unordered_map/erase/51142.cc: New. * testsuite/23_containers/multimap/modifiers/erase/51142.cc: Likewise. * testsuite/23_containers/set/modifiers/erase/51142.cc: Likewise. * testsuite/23_containers/unordered_multimap/erase/51142.cc: Likewise. * testsuite/23_containers/unordered_set/erase/51142.cc: Likewise. * testsuite/23_containers/multiset/modifiers/erase/51142.cc: Likewise. * testsuite/23_containers/unordered_multiset/erase/51142.cc: Likewise. * testsuite/23_containers/map/modifiers/erase/51142.cc: Likewise. From-SVN: r181394
534 lines
15 KiB
C++
534 lines
15 KiB
C++
// Profiling map implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2009, 2010, 2011 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 profile/map.h
|
|
* This file is a GNU profile extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_PROFILE_MAP_H
|
|
#define _GLIBCXX_PROFILE_MAP_H 1
|
|
|
|
#include <utility>
|
|
#include <profile/base.h>
|
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
namespace __profile
|
|
{
|
|
/// Class std::map wrapper with performance instrumentation.
|
|
template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
|
|
typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
|
|
class map
|
|
: public _GLIBCXX_STD_C::map<_Key, _Tp, _Compare, _Allocator>
|
|
{
|
|
typedef _GLIBCXX_STD_C::map<_Key, _Tp, _Compare, _Allocator> _Base;
|
|
|
|
public:
|
|
// types:
|
|
typedef _Key key_type;
|
|
typedef _Tp mapped_type;
|
|
typedef std::pair<const _Key, _Tp> value_type;
|
|
typedef _Compare key_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::size_type size_type;
|
|
typedef typename _Base::difference_type difference_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.3.1.1 construct/copy/destroy:
|
|
explicit
|
|
map(const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__comp, __a)
|
|
{ __profcxx_map_to_unordered_map_construct(this); }
|
|
|
|
template<typename _InputIterator>
|
|
map(_InputIterator __first, _InputIterator __last,
|
|
const _Compare& __comp = _Compare(),
|
|
const _Allocator& __a = _Allocator())
|
|
: _Base(__first, __last, __comp, __a)
|
|
{ __profcxx_map_to_unordered_map_construct(this); }
|
|
|
|
map(const map& __x)
|
|
: _Base(__x)
|
|
{ __profcxx_map_to_unordered_map_construct(this); }
|
|
|
|
map(const _Base& __x)
|
|
: _Base(__x)
|
|
{ __profcxx_map_to_unordered_map_construct(this); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
map(map&& __x)
|
|
noexcept(is_nothrow_copy_constructible<_Compare>::value)
|
|
: _Base(std::move(__x))
|
|
{ }
|
|
|
|
map(initializer_list<value_type> __l,
|
|
const _Compare& __c = _Compare(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__l, __c, __a) { }
|
|
#endif
|
|
|
|
~map() _GLIBCXX_NOEXCEPT
|
|
{ __profcxx_map_to_unordered_map_destruct(this); }
|
|
|
|
map&
|
|
operator=(const map& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
return *this;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
map&
|
|
operator=(map&& __x)
|
|
{
|
|
// NB: DR 1204.
|
|
// NB: DR 675.
|
|
this->clear();
|
|
this->swap(__x);
|
|
return *this;
|
|
}
|
|
|
|
map&
|
|
operator=(initializer_list<value_type> __l)
|
|
{
|
|
this->clear();
|
|
this->insert(__l);
|
|
return *this;
|
|
}
|
|
#endif
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 133. map missing get_allocator()
|
|
using _Base::get_allocator;
|
|
|
|
// iterators:
|
|
iterator
|
|
begin() _GLIBCXX_NOEXCEPT
|
|
{ return _Base::begin(); }
|
|
|
|
const_iterator
|
|
begin() const _GLIBCXX_NOEXCEPT
|
|
{ return _Base::begin(); }
|
|
|
|
iterator
|
|
end() _GLIBCXX_NOEXCEPT
|
|
{ return _Base::end(); }
|
|
|
|
const_iterator
|
|
end() const _GLIBCXX_NOEXCEPT
|
|
{ return _Base::end(); }
|
|
|
|
reverse_iterator
|
|
rbegin() _GLIBCXX_NOEXCEPT
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return reverse_iterator(end());
|
|
}
|
|
|
|
const_reverse_iterator
|
|
rbegin() const _GLIBCXX_NOEXCEPT
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return const_reverse_iterator(end());
|
|
}
|
|
|
|
reverse_iterator
|
|
rend() _GLIBCXX_NOEXCEPT
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return reverse_iterator(begin());
|
|
}
|
|
|
|
const_reverse_iterator
|
|
rend() const _GLIBCXX_NOEXCEPT
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return const_reverse_iterator(begin());
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
const_iterator
|
|
cbegin() const noexcept
|
|
{ return const_iterator(_Base::begin()); }
|
|
|
|
const_iterator
|
|
cend() const noexcept
|
|
{ return const_iterator(_Base::end()); }
|
|
|
|
const_reverse_iterator
|
|
crbegin() const noexcept
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return const_reverse_iterator(end());
|
|
}
|
|
|
|
const_reverse_iterator
|
|
crend() const noexcept
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return const_reverse_iterator(begin());
|
|
}
|
|
#endif
|
|
|
|
// capacity:
|
|
using _Base::empty;
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
|
|
// 23.3.1.2 element access:
|
|
mapped_type&
|
|
operator[](const key_type& __k)
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return _Base::operator[](__k);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
mapped_type&
|
|
operator[](key_type&& __k)
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return _Base::operator[](std::move(__k));
|
|
}
|
|
#endif
|
|
|
|
mapped_type&
|
|
at(const key_type& __k)
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return _Base::at(__k);
|
|
}
|
|
|
|
const mapped_type&
|
|
at(const key_type& __k) const
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return _Base::at(__k);
|
|
}
|
|
|
|
// modifiers:
|
|
std::pair<iterator, bool>
|
|
insert(const value_type& __x)
|
|
{
|
|
__profcxx_map_to_unordered_map_insert(this, size(), 1);
|
|
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);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename _Pair, typename = typename
|
|
std::enable_if<std::is_convertible<_Pair,
|
|
value_type>::value>::type>
|
|
std::pair<iterator, bool>
|
|
insert(_Pair&& __x)
|
|
{
|
|
__profcxx_map_to_unordered_map_insert(this, size(), 1);
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
std::pair<_Base_iterator, bool> __res
|
|
= _Base::insert(std::forward<_Pair>(__x));
|
|
return std::pair<iterator, bool>(iterator(__res.first),
|
|
__res.second);
|
|
}
|
|
#endif
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
void
|
|
insert(std::initializer_list<value_type> __list)
|
|
{
|
|
size_type size_before = size();
|
|
_Base::insert(__list);
|
|
__profcxx_map_to_unordered_map_insert(this, size_before,
|
|
size() - size_before);
|
|
}
|
|
#endif
|
|
|
|
iterator
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
insert(const_iterator __position, const value_type& __x)
|
|
#else
|
|
insert(iterator __position, const value_type& __x)
|
|
#endif
|
|
{
|
|
size_type size_before = size();
|
|
iterator __i = iterator(_Base::insert(__position, __x));
|
|
__profcxx_map_to_unordered_map_insert(this, size_before,
|
|
size() - size_before);
|
|
return __i;
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename _Pair, typename = typename
|
|
std::enable_if<std::is_convertible<_Pair,
|
|
value_type>::value>::type>
|
|
iterator
|
|
insert(const_iterator __position, _Pair&& __x)
|
|
{
|
|
size_type size_before = size();
|
|
iterator __i
|
|
= iterator(_Base::insert(__position, std::forward<_Pair>(__x)));
|
|
__profcxx_map_to_unordered_map_insert(this, size_before,
|
|
size() - size_before);
|
|
return __i;
|
|
}
|
|
#endif
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
size_type size_before = size();
|
|
_Base::insert(__first, __last);
|
|
__profcxx_map_to_unordered_map_insert(this, size_before,
|
|
size() - size_before);
|
|
}
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
iterator
|
|
erase(const_iterator __position)
|
|
{
|
|
iterator __i = _Base::erase(__position);
|
|
__profcxx_map_to_unordered_map_erase(this, size(), 1);
|
|
return __i;
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __position)
|
|
{ return erase(const_iterator(__position)); }
|
|
#else
|
|
void
|
|
erase(iterator __position)
|
|
{
|
|
_Base::erase(__position);
|
|
__profcxx_map_to_unordered_map_erase(this, size(), 1);
|
|
}
|
|
#endif
|
|
|
|
size_type
|
|
erase(const key_type& __x)
|
|
{
|
|
iterator __victim = find(__x);
|
|
if (__victim == end())
|
|
return 0;
|
|
else
|
|
{
|
|
_Base::erase(__victim);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
#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(map& __x)
|
|
{ _Base::swap(__x); }
|
|
|
|
void
|
|
clear() _GLIBCXX_NOEXCEPT
|
|
{ this->erase(begin(), end()); }
|
|
|
|
// observers:
|
|
using _Base::key_comp;
|
|
using _Base::value_comp;
|
|
|
|
// 23.3.1.3 map operations:
|
|
iterator
|
|
find(const key_type& __x)
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return iterator(_Base::find(__x));
|
|
}
|
|
|
|
const_iterator
|
|
find(const key_type& __x) const
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return const_iterator(_Base::find(__x));
|
|
}
|
|
|
|
size_type
|
|
count(const key_type& __x) const
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
return _Base::count(__x);
|
|
}
|
|
|
|
iterator
|
|
lower_bound(const key_type& __x)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return iterator(_Base::lower_bound(__x));
|
|
}
|
|
|
|
const_iterator
|
|
lower_bound(const key_type& __x) const
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return const_iterator(_Base::lower_bound(__x));
|
|
}
|
|
|
|
iterator
|
|
upper_bound(const key_type& __x)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
return iterator(_Base::upper_bound(__x));
|
|
}
|
|
|
|
const_iterator
|
|
upper_bound(const key_type& __x) const
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(this);
|
|
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));
|
|
}
|
|
|
|
std::pair<const_iterator,const_iterator>
|
|
equal_range(const key_type& __x) const
|
|
{
|
|
__profcxx_map_to_unordered_map_find(this, size());
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
std::pair<_Base_const_iterator, _Base_const_iterator> __res =
|
|
_Base::equal_range(__x);
|
|
return std::make_pair(const_iterator(__res.first),
|
|
const_iterator(__res.second));
|
|
}
|
|
|
|
_Base&
|
|
_M_base() _GLIBCXX_NOEXCEPT { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const _GLIBCXX_NOEXCEPT { return *this; }
|
|
|
|
};
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator==(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() == __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() != __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator<(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() < __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() <= __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() >= __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline bool
|
|
operator>(const map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
const map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{
|
|
__profcxx_map_to_unordered_map_invalidate(&__lhs);
|
|
__profcxx_map_to_unordered_map_invalidate(&__rhs);
|
|
return __lhs._M_base() > __rhs._M_base();
|
|
}
|
|
|
|
template<typename _Key, typename _Tp,
|
|
typename _Compare, typename _Allocator>
|
|
inline void
|
|
swap(map<_Key, _Tp, _Compare, _Allocator>& __lhs,
|
|
map<_Key, _Tp, _Compare, _Allocator>& __rhs)
|
|
{ __lhs.swap(__rhs); }
|
|
|
|
} // namespace __profile
|
|
} // namespace std
|
|
|
|
#endif
|