ced3cb9f72
2008-09-30 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/30085 (again) * include/debug/unordered_map (unordered_map<>, unordered_multimap<>): Do not derive from _Safe_association, derive from _GLIBCXX_STD_D:: unordered_map / unordered_multimap; add missing member functions. * include/debug/unordered_set (unordered_set<>, unordered_multiset<>): Likewise for _GLIBCXX_STD_D::unordered_set / unordered_multiset. * include/debug/safe_association.h: Remove. * include/Makefile.am: Adjust. * include/Makefile.in: Regenerate. * testsuite/23_containers/unordered_multimap/init-list.cc: Remove xfail. From-SVN: r140786
607 lines
17 KiB
C++
607 lines
17 KiB
C++
// Debugging unordered_set/unordered_multiset implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
|
|
// 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/unordered_set
|
|
* This file is a GNU debug extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_DEBUG_UNORDERED_SET
|
|
#define _GLIBCXX_DEBUG_UNORDERED_SET 1
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
# include <unordered_set>
|
|
#else
|
|
# include <c++0x_warning.h>
|
|
#endif
|
|
|
|
#include <debug/safe_sequence.h>
|
|
#include <debug/safe_iterator.h>
|
|
#include <initializer_list>
|
|
|
|
namespace std
|
|
{
|
|
namespace __debug
|
|
{
|
|
template<typename _Value,
|
|
typename _Hash = std::hash<_Value>,
|
|
typename _Pred = std::equal_to<_Value>,
|
|
typename _Alloc = std::allocator<_Value> >
|
|
class unordered_set
|
|
: public _GLIBCXX_STD_D::unordered_set<_Value, _Hash, _Pred, _Alloc>,
|
|
public __gnu_debug::_Safe_sequence<unordered_set<_Value, _Hash,
|
|
_Pred, _Alloc> >
|
|
{
|
|
typedef _GLIBCXX_STD_D::unordered_set<_Value, _Hash,
|
|
_Pred, _Alloc> _Base;
|
|
typedef __gnu_debug::_Safe_sequence<unordered_set> _Safe_base;
|
|
|
|
public:
|
|
typedef typename _Base::size_type size_type;
|
|
typedef typename _Base::hasher hasher;
|
|
typedef typename _Base::key_equal key_equal;
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,
|
|
unordered_set> iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
|
|
unordered_set> const_iterator;
|
|
|
|
explicit
|
|
unordered_set(size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__n, __hf, __eql, __a) { }
|
|
|
|
template<typename _InputIterator>
|
|
unordered_set(_InputIterator __f, _InputIterator __l,
|
|
size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n,
|
|
__hf, __eql, __a), _Safe_base() { }
|
|
|
|
unordered_set(const unordered_set& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
unordered_set(const _Base& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
unordered_set(unordered_set&& __x)
|
|
: _Base(std::forward<unordered_set>(__x)), _Safe_base() { }
|
|
|
|
unordered_set(initializer_list<value_type> __l,
|
|
size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__l, __n, __hf, __eql, __a), _Safe_base() { }
|
|
|
|
unordered_set&
|
|
operator=(const unordered_set& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
this->_M_invalidate_all();
|
|
return *this;
|
|
}
|
|
|
|
unordered_set&
|
|
operator=(unordered_set&& __x)
|
|
{
|
|
// NB: DR 675.
|
|
clear();
|
|
swap(__x);
|
|
return *this;
|
|
}
|
|
|
|
unordered_set&
|
|
operator=(initializer_list<value_type> __l)
|
|
{
|
|
this->clear();
|
|
this->insert(__l);
|
|
return *this;
|
|
}
|
|
|
|
void
|
|
swap(unordered_set&& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
_Safe_base::_M_swap(__x);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{
|
|
_Base::clear();
|
|
this->_M_invalidate_all();
|
|
}
|
|
|
|
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); }
|
|
|
|
const_iterator
|
|
cbegin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
cend() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
// local versions
|
|
using _Base::begin;
|
|
using _Base::end;
|
|
using _Base::cbegin;
|
|
using _Base::cend;
|
|
|
|
std::pair<iterator, bool>
|
|
insert(const value_type& __obj)
|
|
{
|
|
typedef std::pair<typename _Base::iterator, bool> __pair_type;
|
|
__pair_type __res = _Base::insert(__obj);
|
|
return std::make_pair(iterator(__res.first, this), __res.second);
|
|
}
|
|
|
|
iterator
|
|
insert(iterator, const value_type& __obj)
|
|
{
|
|
typedef std::pair<typename _Base::iterator, bool> __pair_type;
|
|
__pair_type __res = _Base::insert(__obj);
|
|
return iterator(__res.first, this);
|
|
}
|
|
|
|
const_iterator
|
|
insert(const_iterator, const value_type& __obj)
|
|
{
|
|
typedef std::pair<typename _Base::iterator, bool> __pair_type;
|
|
__pair_type __res = _Base::insert(__obj);
|
|
return const_iterator(__res.first, this);
|
|
}
|
|
|
|
void
|
|
insert(std::initializer_list<value_type> __l)
|
|
{ _Base::insert(__l); }
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_valid_range(__first, __last);
|
|
_Base::insert(__first, __last);
|
|
}
|
|
|
|
iterator
|
|
find(const key_type& __key)
|
|
{ return iterator(_Base::find(__key), this); }
|
|
|
|
const_iterator
|
|
find(const key_type& __key) const
|
|
{ return const_iterator(_Base::find(__key), this); }
|
|
|
|
std::pair<iterator, iterator>
|
|
equal_range(const key_type& __key)
|
|
{
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
typedef std::pair<_Base_iterator, _Base_iterator> __pair_type;
|
|
__pair_type __res = _Base::equal_range(__key);
|
|
return std::make_pair(iterator(__res.first, this),
|
|
iterator(__res.second, this));
|
|
}
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
equal_range(const key_type& __key) const
|
|
{
|
|
typedef typename _Base::const_iterator _Base_iterator;
|
|
typedef std::pair<_Base_iterator, _Base_iterator> __pair_type;
|
|
__pair_type __res = _Base::equal_range(__key);
|
|
return std::make_pair(const_iterator(__res.first, this),
|
|
const_iterator(__res.second, this));
|
|
}
|
|
|
|
size_type
|
|
erase(const key_type& __key)
|
|
{
|
|
size_type __ret(0);
|
|
iterator __victim(_Base::find(__key), this);
|
|
if (__victim != end())
|
|
{
|
|
this->erase(__victim);
|
|
__ret = 1;
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __it)
|
|
{
|
|
__glibcxx_check_erase(__it);
|
|
__it._M_invalidate();
|
|
return iterator(_Base::erase(__it.base()), this);
|
|
}
|
|
|
|
const_iterator
|
|
erase(const_iterator __it)
|
|
{
|
|
__glibcxx_check_erase(__it);
|
|
__it._M_invalidate();
|
|
return const_iterator(_Base::erase(__it.base()), this);
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
for (iterator __tmp = __first; __tmp != __last;)
|
|
{
|
|
iterator __victim = __tmp++;
|
|
__victim._M_invalidate();
|
|
}
|
|
return iterator(_Base::erase(__first.base(),
|
|
__last.base()), this);
|
|
}
|
|
|
|
const_iterator
|
|
erase(const_iterator __first, const_iterator __last)
|
|
{
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
for (const_iterator __tmp = __first; __tmp != __last;)
|
|
{
|
|
const_iterator __victim = __tmp++;
|
|
__victim._M_invalidate();
|
|
}
|
|
return const_iterator(_Base::erase(__first.base(),
|
|
__last.base()), this);
|
|
}
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
|
|
private:
|
|
void
|
|
_M_invalidate_all()
|
|
{
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
|
|
this->_M_invalidate_if(_Not_equal(_M_base().end()));
|
|
}
|
|
};
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_set<_Value, _Hash, _Pred, _Alloc>&& __x,
|
|
unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
unordered_set<_Value, _Hash, _Pred, _Alloc>&& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
|
|
template<typename _Value,
|
|
typename _Hash = std::hash<_Value>,
|
|
typename _Pred = std::equal_to<_Value>,
|
|
typename _Alloc = std::allocator<_Value> >
|
|
class unordered_multiset
|
|
: public _GLIBCXX_STD_D::unordered_multiset<_Value, _Hash, _Pred, _Alloc>,
|
|
public __gnu_debug::_Safe_sequence<unordered_multiset<_Value, _Hash,
|
|
_Pred, _Alloc> >
|
|
{
|
|
typedef _GLIBCXX_STD_D::unordered_multiset<_Value, _Hash,
|
|
_Pred, _Alloc> _Base;
|
|
typedef __gnu_debug::_Safe_sequence<unordered_multiset> _Safe_base;
|
|
|
|
public:
|
|
typedef typename _Base::size_type size_type;
|
|
typedef typename _Base::hasher hasher;
|
|
typedef typename _Base::key_equal key_equal;
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
typedef typename _Base::key_type key_type;
|
|
typedef typename _Base::value_type value_type;
|
|
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,
|
|
unordered_multiset> iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
|
|
unordered_multiset> const_iterator;
|
|
|
|
explicit
|
|
unordered_multiset(size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__n, __hf, __eql, __a) { }
|
|
|
|
template<typename _InputIterator>
|
|
unordered_multiset(_InputIterator __f, _InputIterator __l,
|
|
size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n,
|
|
__hf, __eql, __a), _Safe_base() { }
|
|
|
|
unordered_multiset(const unordered_multiset& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
unordered_multiset(const _Base& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
unordered_multiset(unordered_multiset&& __x)
|
|
: _Base(std::forward<unordered_multiset>(__x)), _Safe_base() { }
|
|
|
|
unordered_multiset(initializer_list<value_type> __l,
|
|
size_type __n = 10,
|
|
const hasher& __hf = hasher(),
|
|
const key_equal& __eql = key_equal(),
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__l, __n, __hf, __eql, __a), _Safe_base() { }
|
|
|
|
unordered_multiset&
|
|
operator=(const unordered_multiset& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
this->_M_invalidate_all();
|
|
return *this;
|
|
}
|
|
|
|
unordered_multiset&
|
|
operator=(unordered_multiset&& __x)
|
|
{
|
|
// NB: DR 675.
|
|
clear();
|
|
swap(__x);
|
|
return *this;
|
|
}
|
|
|
|
unordered_multiset&
|
|
operator=(initializer_list<value_type> __l)
|
|
{
|
|
this->clear();
|
|
this->insert(__l);
|
|
return *this;
|
|
}
|
|
|
|
void
|
|
swap(unordered_multiset&& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
_Safe_base::_M_swap(__x);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{
|
|
_Base::clear();
|
|
this->_M_invalidate_all();
|
|
}
|
|
|
|
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); }
|
|
|
|
const_iterator
|
|
cbegin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
cend() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
// local versions
|
|
using _Base::begin;
|
|
using _Base::end;
|
|
using _Base::cbegin;
|
|
using _Base::cend;
|
|
|
|
iterator
|
|
insert(const value_type& __obj)
|
|
{ return iterator(_Base::insert(__obj), this); }
|
|
|
|
iterator
|
|
insert(iterator, const value_type& __obj)
|
|
{ return iterator(_Base::insert(__obj), this); }
|
|
|
|
const_iterator
|
|
insert(const_iterator, const value_type& __obj)
|
|
{ return const_iterator(_Base::insert(__obj), this); }
|
|
|
|
void
|
|
insert(std::initializer_list<value_type> __l)
|
|
{ _Base::insert(__l); }
|
|
|
|
template<typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_valid_range(__first, __last);
|
|
_Base::insert(__first, __last);
|
|
}
|
|
|
|
iterator
|
|
find(const key_type& __key)
|
|
{ return iterator(_Base::find(__key), this); }
|
|
|
|
const_iterator
|
|
find(const key_type& __key) const
|
|
{ return const_iterator(_Base::find(__key), this); }
|
|
|
|
std::pair<iterator, iterator>
|
|
equal_range(const key_type& __key)
|
|
{
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
typedef std::pair<_Base_iterator, _Base_iterator> __pair_type;
|
|
__pair_type __res = _Base::equal_range(__key);
|
|
return std::make_pair(iterator(__res.first, this),
|
|
iterator(__res.second, this));
|
|
}
|
|
|
|
std::pair<const_iterator, const_iterator>
|
|
equal_range(const key_type& __key) const
|
|
{
|
|
typedef typename _Base::const_iterator _Base_iterator;
|
|
typedef std::pair<_Base_iterator, _Base_iterator> __pair_type;
|
|
__pair_type __res = _Base::equal_range(__key);
|
|
return std::make_pair(const_iterator(__res.first, this),
|
|
const_iterator(__res.second, this));
|
|
}
|
|
|
|
size_type
|
|
erase(const key_type& __key)
|
|
{
|
|
size_type __ret(0);
|
|
iterator __victim(_Base::find(__key), this);
|
|
if (__victim != end())
|
|
{
|
|
this->erase(__victim);
|
|
__ret = 1;
|
|
}
|
|
return __ret;
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __it)
|
|
{
|
|
__glibcxx_check_erase(__it);
|
|
__it._M_invalidate();
|
|
return iterator(_Base::erase(__it.base()), this);
|
|
}
|
|
|
|
const_iterator
|
|
erase(const_iterator __it)
|
|
{
|
|
__glibcxx_check_erase(__it);
|
|
__it._M_invalidate();
|
|
return const_iterator(_Base::erase(__it.base()), this);
|
|
}
|
|
|
|
iterator
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
for (iterator __tmp = __first; __tmp != __last;)
|
|
{
|
|
iterator __victim = __tmp++;
|
|
__victim._M_invalidate();
|
|
}
|
|
return iterator(_Base::erase(__first.base(),
|
|
__last.base()), this);
|
|
}
|
|
|
|
const_iterator
|
|
erase(const_iterator __first, const_iterator __last)
|
|
{
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
for (const_iterator __tmp = __first; __tmp != __last;)
|
|
{
|
|
const_iterator __victim = __tmp++;
|
|
__victim._M_invalidate();
|
|
}
|
|
return const_iterator(_Base::erase(__first.base(),
|
|
__last.base()), this);
|
|
}
|
|
|
|
_Base&
|
|
_M_base() { return *this; }
|
|
|
|
const _Base&
|
|
_M_base() const { return *this; }
|
|
|
|
private:
|
|
void
|
|
_M_invalidate_all()
|
|
{
|
|
typedef typename _Base::const_iterator _Base_const_iterator;
|
|
typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
|
|
this->_M_invalidate_if(_Not_equal(_M_base().end()));
|
|
}
|
|
};
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>&& __x,
|
|
unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
template<typename _Value, typename _Hash, typename _Pred, typename _Alloc>
|
|
inline void
|
|
swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
|
|
unordered_multiset<_Value, _Hash, _Pred, _Alloc>&& __y)
|
|
{ __x.swap(__y); }
|
|
|
|
} // namespace __debug
|
|
} // namespace std
|
|
|
|
#endif
|