45f388bb44
2006-02-21 Benjamin Kosnik <bkoz@redhat.com> * include/bits/c++config: Simplify debug namespaces. * include/ext/hash_set: Specialize insert_iterator after norm, debug containers have been (optionally) declared. Use nested namespaces. * include/ext/hash_map: Same. * include/debug/hash_map.h (insert): Add specialization for value pointer types. * include/debug/hash_set.h (insert): Same. * include/debug/hash_multimap.h: Change __gnu_debug_def to __debug. * include/debug/set.h: Same. * include/debug/bitset: Same. * include/debug/multiset.h: Same. * include/debug/hash_multiset.h: Same. * include/debug/vector: Same. * include/debug/map.h: Same. * include/debug/deque: Same. * include/debug/list: Same. * include/debug/multimap.h. Same. * include/debug/macros.h: Use __gnu_debug. * include/debug/debug.h: Same. * include/debug/formatter.h: Same. * include/debug/safe_sequence.h: Same. * include/debug/functions.h: Same. * include/debug/safe_base.h: Same. * include/debug/safe_iterator.h: Same. * include/debug/safe_iterator.tcc: Same. (_M_invalidate): Adjust compare order. * include/debug/string: Change std::__gnu_debug to __gnu_debug. * include/ext/hashtable.h: Formatting fixes. * include/bits/stl_map.h: Formatting fixes. * src/compatibility.cc: Adjust compatibility symbols for old debug mode model. * src/debug_list.cc: Tweak. * src/debug.cc: Adjust namespaces. * docs/html/debug_mode.html: Adjust namespace names. * testsuite/25_algorithms/heap/heap.cc: Restore _GLIBCXX_DEBUG macro guards, as count values differ when in debug mode. * testsuite/23_containers/vector/26412.cc: Move to... * testsuite/23_containers/vector/26412-1.cc: ... here. * testsuite/23_containers/vector/26412-2.cc: Add. * include/ext/pb_assoc/detail/standard_policies.hpp (PB_ASSOC_HASH_NAMESPACE): Remove, use __gnu_cxx::hash_map and std::equal_to. * configure.ac (libtool_VERSION): To 6:8:0. * configure: Regenerate. * config/abi/pre/gnu.ver: Revert to exporting __gnu_debug symbols. (GLIBCXX_3.4.8): New. * testsuite/testsuite_abi.cc: Add GLIBCXX_3.4.8 to known versions. From-SVN: r111356
329 lines
10 KiB
C++
329 lines
10 KiB
C++
// Debugging set implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2003, 2004, 2005
|
|
// 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.
|
|
|
|
#ifndef _GLIBCXX_DEBUG_SET_H
|
|
#define _GLIBCXX_DEBUG_SET_H 1
|
|
|
|
#include <debug/safe_sequence.h>
|
|
#include <debug/safe_iterator.h>
|
|
#include <utility>
|
|
|
|
namespace std
|
|
{
|
|
namespace __debug
|
|
{
|
|
template<typename _Key, typename _Compare = std::less<_Key>,
|
|
typename _Allocator = std::allocator<_Key> >
|
|
class set
|
|
: public _GLIBCXX_STD::set<_Key,_Compare,_Allocator>,
|
|
public __gnu_debug::_Safe_sequence<set<_Key, _Compare, _Allocator> >
|
|
{
|
|
typedef _GLIBCXX_STD::set<_Key,_Compare,_Allocator> _Base;
|
|
typedef __gnu_debug::_Safe_sequence<set> _Safe_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 __gnu_debug::_Safe_iterator<typename _Base::iterator, set>
|
|
iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator, set>
|
|
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.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(__gnu_debug::__check_valid_range(__first, __last), __last,
|
|
__comp, __a) { }
|
|
|
|
set(const set<_Key,_Compare,_Allocator>& __x)
|
|
: _Base(__x), _Safe_base() { }
|
|
|
|
set(const _Base& __x) : _Base(__x), _Safe_base() { }
|
|
|
|
~set() { }
|
|
|
|
set<_Key,_Compare,_Allocator>&
|
|
operator=(const set<_Key,_Compare,_Allocator>& __x)
|
|
{
|
|
*static_cast<_Base*>(this) = __x;
|
|
this->_M_invalidate_all();
|
|
return *this;
|
|
}
|
|
|
|
using _Base::get_allocator;
|
|
|
|
// iterators:
|
|
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); }
|
|
|
|
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()); }
|
|
|
|
// 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, this),
|
|
__res.second);
|
|
}
|
|
|
|
iterator
|
|
insert(iterator __position, const value_type& __x)
|
|
{
|
|
__glibcxx_check_insert(__position);
|
|
return iterator(_Base::insert(__position.base(), __x), this);
|
|
}
|
|
|
|
template <typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_valid_range(__first, __last);
|
|
_Base::insert(__first, __last);
|
|
}
|
|
|
|
void
|
|
erase(iterator __position)
|
|
{
|
|
__glibcxx_check_erase(__position);
|
|
__position._M_invalidate();
|
|
_Base::erase(__position.base());
|
|
}
|
|
|
|
size_type
|
|
erase(const key_type& __x)
|
|
{
|
|
iterator __victim = find(__x);
|
|
if (__victim == end())
|
|
return 0;
|
|
else
|
|
{
|
|
__victim._M_invalidate();
|
|
_Base::erase(__victim.base());
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
void
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 151. can't currently clear() empty container
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
|
|
while (__first != __last)
|
|
this->erase(__first++);
|
|
}
|
|
|
|
void
|
|
swap(set<_Key,_Compare,_Allocator>& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
this->_M_swap(__x);
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{ 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), this); }
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 214. set::find() missing const overload
|
|
const_iterator
|
|
find(const key_type& __x) const
|
|
{ return const_iterator(_Base::find(__x), this); }
|
|
|
|
using _Base::count;
|
|
|
|
iterator
|
|
lower_bound(const key_type& __x)
|
|
{ return iterator(_Base::lower_bound(__x), this); }
|
|
|
|
// _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), this); }
|
|
|
|
iterator
|
|
upper_bound(const key_type& __x)
|
|
{ return iterator(_Base::upper_bound(__x), this); }
|
|
|
|
// _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), this); }
|
|
|
|
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, this),
|
|
iterator(__res.second, this));
|
|
}
|
|
|
|
// _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, this),
|
|
const_iterator(__res.second, 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 _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 __debug
|
|
} // namespace std
|
|
|
|
#endif
|