285b36d6a5
2003-11-11 Doug Gregor <gregod@cs.rpi.edu> * docs/html/debug.html: Document libstdc++ debug mode. * docs/html/debug_mode.html: Document libstdc++ debug mode design. * docs/html/test.html: Document how to test under debug mode. * docs/html/17_intro/howto.html: Document debug-mode macros. * include/Makefile.am: Install debug-mode headers. * src/Makefile.am: Include debug.cc. * include/bits/basic_string.tcc: (basic_string::_S_construct): Fix NULL pointer check. (__is_null_pointer): New. Add precondition annotations. * include/bits/stream_iterator.h (istream_iterator, ostream_iterator): Added precondition annotations. * include/bits/streambuf_iterator.h (istreambuf_iterator): Ditto. * include/bits/stl_queue.h (queue, priority_queue): Ditto. * include/bits/stl_stack.h (stack): Ditto. * include/bits/basic_string.h (basic_string): Ditto. * include/bits/basic_string.tcc (basic_string): Ditto. * include/std/std_memory.h (auto_ptr): Ditto. * include/std/std_valarray.h (valarray): Ditto. * include/bits/stl_algo.h: Added algorithm precondition annotations. * include/bits/stl_algobase.h: Added algorithm precondition annotations. * include/bits/stl_numeric.h: Ditto. * include/ext/algorithm: Added algorithm precondition annotations. (__is_heap): Moved away from here. * include/bits/stl_heap.h: Added algorithm precondition annotations. (__is_heap): Moved to the top of this file. (__is_heap): Added iterator range overloads. * testsuite/20_util/auto_ptr_neg.cc: Fix line numbers to match up with changes in std_memory.h. * testsuite/23_containers/list/operators/4.cc: Don't verify performance guarantees when in debug mode. * testsuite/23_containers/bitset/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/1.cc: New. * testsuite/23_containers/deque/invalidation/2.cc: New. * testsuite/23_containers/deque/invalidation/3.cc: New. * testsuite/23_containers/deque/invalidation/4.cc: New. * testsuite/23_containers/list/invalidation/1.cc: New. * testsuite/23_containers/list/invalidation/2.cc: New. * testsuite/23_containers/list/invalidation/3.cc: New. * testsuite/23_containers/list/invalidation/4.cc: New. * testsuite/23_containers/map/invalidation/1.cc: New. * testsuite/23_containers/map/invalidation/2.cc: New. * testsuite/23_containers/multimap/invalidation/1.cc: New. * testsuite/23_containers/multimap/invalidation/2.cc: New. * testsuite/23_containers/multiset/invalidation/1.cc: New. * testsuite/23_containers/multiset/invalidation/2.cc: New. * testsuite/23_containers/set/invalidation/1.cc: New. * testsuite/23_containers/set/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/1.cc: New. * testsuite/23_containers/vector/invalidation/2.cc: New. * testsuite/23_containers/vector/invalidation/3.cc: New. * testsuite/23_containers/vector/invalidation/4.cc: New. * testsuite/25_algorithms/heap.cc: Don't verify performance guarantees when in debug mode. * include/debug/bitset: New. * include/debug/debug.h: New. * include/debug/deque: New. * include/debug/formatter.h: New. * include/debug/hash_map: New. * include/debug/hash_map.h: New. * include/debug/hash_multimap.h: New. * include/debug/hash_set: New. * include/debug/hash_set.h: New. * include/debug/hash_multiset.h: New. * include/debug/list: New. * include/debug/map: New. * include/debug/map.h: New. * include/debug/multimap.h: New. * include/debug/multiset.h: New. * include/debug/safe_base.h: New. * include/debug/safe_iterator.h: New. * include/debug/safe_iterator.tcc: New. * include/debug/safe_sequence.h: New. * include/debug/set: New. * include/debug/set.h: New. * include/debug/string: New. * include/debug/vector: New. * src/debug.cc: New. * config/linker-map.gnu: Add debug mode symbols. 2003-11-11 Benjamin Kosnik <bkoz@redhat.com> * src/string-inst.cc: Tweak namespaces. * src/misc-inst.cc: Same. * docs/html/debug.html: Edits. * config/link-map.gnu: Remove cruft. * include/bits/c++config: Add in namespace associations. * include/std/std_bitset.h: Adjust namespace to __gnu_norm, comment tweaks. * include/bits/deque.tcc: Same. * include/bits/list.tcc: Same. * include/bits/stl_bvector.h: Same. * include/bits/stl_deque.h: Same. * include/bits/stl_list.h: Same. * include/bits/stl_map.h: Same. * include/bits/stl_multimap.h: Same. * include/bits/stl_multiset.h: Same. * include/bits/stl_set.h: Same. * include/bits/stl_vector.h: Same. * include/bits/vector.tcc: Same. * include/std/std_algorithm.h: Remove markup comments. * include/std/std_functional.h: Same. * include/std/std_iterator.h: Same. * include/std/std_numeric.h: Same. * include/std/std_utility.h: Same. * include/bits/stl_queue.h: Formatting tweaks. * include/bits/stl_stack.h: Same. * include/std/std_deque.h: Include debugging version in debug mode. * include/std/std_list.h: Same. * include/std/std_map.h: Same. * include/std/std_set.h: Same. * include/std/std_vector.h: Same. * include/std/std_queue.h: Use deque, vector. * include/std/std_stack.h: Same. From-SVN: r73459
262 lines
8.7 KiB
C++
262 lines
8.7 KiB
C++
// Debugging hash_multimap implementation -*- C++ -*-
|
|
|
|
// Copyright (C) 2003
|
|
// 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// 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_HASH_MULTIMAP_H
|
|
#define _GLIBCXX_DEBUG_HASH_MULTIMAP_H 1
|
|
|
|
#include <debug/safe_sequence.h>
|
|
#include <debug/safe_iterator.h>
|
|
|
|
namespace __gnu_debug_def
|
|
{
|
|
template<typename _Value, typename _Tp,
|
|
typename _HashFcn = __gnu_cxx::hash<_Value>,
|
|
typename _EqualKey = std::equal_to<_Value>,
|
|
typename _Alloc = std::allocator<_Value> >
|
|
class hash_multimap
|
|
: public __gnu_cxx::hash_multimap<_Value,_Tp,_HashFcn, _EqualKey,_Alloc>,
|
|
public __gnu_debug::_Safe_sequence<hash_multimap<_Value, _Tp, _HashFcn,
|
|
_EqualKey, _Alloc> >
|
|
{
|
|
typedef __gnu_cxx::hash_multimap<_Value,_Tp,_HashFcn, _EqualKey,_Alloc>
|
|
_Base;
|
|
typedef __gnu_debug::_Safe_sequence<hash_multimap> _Safe_base;
|
|
|
|
public:
|
|
typedef typename _Base::key_type key_type;
|
|
typedef typename _Base::data_type data_type;
|
|
typedef typename _Base::mapped_type mapped_type;
|
|
typedef typename _Base::value_type value_type;
|
|
typedef typename _Base::hasher hasher;
|
|
typedef typename _Base::key_equal key_equal;
|
|
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 typename _Base::reference reference;
|
|
typedef typename _Base::const_reference const_reference;
|
|
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,
|
|
hash_multimap> iterator;
|
|
typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
|
|
hash_multimap> const_iterator;
|
|
|
|
typedef typename _Base::allocator_type allocator_type;
|
|
|
|
using _Base::hash_funct;
|
|
using _Base::key_eq;
|
|
using _Base::get_allocator;
|
|
|
|
hash_multimap() { }
|
|
|
|
explicit hash_multimap(size_type __n) : _Base(__n) { }
|
|
|
|
hash_multimap(size_type __n, const hasher& __hf) : _Base(__n, __hf) { }
|
|
|
|
hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__n, __hf, __eql, __a) { }
|
|
|
|
template<typename _InputIterator>
|
|
hash_multimap(_InputIterator __f, _InputIterator __l)
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l) { }
|
|
|
|
template<typename _InputIterator>
|
|
hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n) { }
|
|
|
|
template<typename _InputIterator>
|
|
hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
|
|
const hasher& __hf)
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf) { }
|
|
|
|
template<typename _InputIterator>
|
|
hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
|
|
const hasher& __hf, const key_equal& __eql,
|
|
const allocator_type& __a = allocator_type())
|
|
: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf,
|
|
__eql, __a) { }
|
|
|
|
using _Base::size;
|
|
using _Base::max_size;
|
|
using _Base::empty;
|
|
|
|
void
|
|
swap(hash_multimap& __x)
|
|
{
|
|
_Base::swap(__x);
|
|
this->_M_swap(__x);
|
|
}
|
|
|
|
iterator
|
|
begin() { return iterator(_Base::begin(), this); }
|
|
|
|
iterator
|
|
end() { return iterator(_Base::end(), this); }
|
|
|
|
const_iterator
|
|
begin() const
|
|
{ return const_iterator(_Base::begin(), this); }
|
|
|
|
const_iterator
|
|
end() const
|
|
{ return const_iterator(_Base::end(), this); }
|
|
|
|
iterator
|
|
insert(const value_type& __obj)
|
|
{ return iterator(_Base::insert(__obj), this); }
|
|
|
|
template <typename _InputIterator>
|
|
void
|
|
insert(_InputIterator __first, _InputIterator __last)
|
|
{
|
|
__glibcxx_check_valid_range(__first, __last);
|
|
_Base::insert(__first.base(), __last.base());
|
|
}
|
|
|
|
iterator
|
|
insert_noresize(const value_type& __obj)
|
|
{ return iterator(_Base::insert_noresize(__obj), this); }
|
|
|
|
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); }
|
|
|
|
using _Base::count;
|
|
|
|
std::pair<iterator, iterator>
|
|
equal_range(const key_type& __key)
|
|
{
|
|
typedef typename _Base::iterator _Base_iterator;
|
|
std::pair<_Base_iterator, _Base_iterator> __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;
|
|
std::pair<_Base_iterator, _Base_iterator> __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)
|
|
{
|
|
std::pair<iterator, iterator> __victims = this->equal_range(__key);
|
|
size_t __num_victims = 0;
|
|
while (__victims.first != __victims.second)
|
|
{
|
|
this->erase(__victims.first++);
|
|
++__num_victims;
|
|
}
|
|
return __num_victims;
|
|
}
|
|
|
|
void
|
|
erase(iterator __it)
|
|
{
|
|
__glibcxx_check_erase(__it);
|
|
__it._M_invalidate();
|
|
_Base::erase(__it.base());
|
|
}
|
|
|
|
void
|
|
erase(iterator __first, iterator __last)
|
|
{
|
|
__glibcxx_check_erase_range(__first, __last);
|
|
for (iterator __tmp = __first; __tmp != __last;)
|
|
{
|
|
iterator __victim = __tmp++;
|
|
__victim._M_invalidate();
|
|
}
|
|
_Base::erase(__first.base(), __last.base());
|
|
}
|
|
|
|
void
|
|
clear()
|
|
{
|
|
_Base::clear();
|
|
this->_M_invalidate_all();
|
|
}
|
|
|
|
using _Base::resize;
|
|
using _Base::bucket_count;
|
|
using _Base::max_bucket_count;
|
|
using _Base::elems_in_bucket;
|
|
|
|
_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 _Tp, typename _HashFcn,
|
|
typename _EqualKey, typename _Alloc>
|
|
inline bool
|
|
operator==(const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __x,
|
|
const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __y)
|
|
{ return __x._M_base() == __y._M_base(); }
|
|
|
|
template<typename _Value, typename _Tp, typename _HashFcn,
|
|
typename _EqualKey, typename _Alloc>
|
|
inline bool
|
|
operator!=(const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __x,
|
|
const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __y)
|
|
{ return __x._M_base() != __y._M_base(); }
|
|
|
|
template<typename _Value, typename _Tp, typename _HashFcn,
|
|
typename _EqualKey, typename _Alloc>
|
|
inline void
|
|
swap(hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x,
|
|
hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y)
|
|
{ __x.swap(__y); }
|
|
} // namespace __gnu_debug_def
|
|
|
|
#endif
|