f7ace77f1f
2006-01-04 Paolo Carlini <pcarlini@suse.de> * include/ext/sso_string_base.h (__sso_string_base<>::_M_dataplus): Use _CharT_alloc_type as base class. (_M_get_allocator, _M_swap, _M_create, _M_destroy): Adjust. * include/ext/vstring.h (get_allocator): Tidy. 2006-01-04 Paolo Carlini <pcarlini@suse.de> Implement Option 3 of DR 431 for all the containers. * include/bits/allocator.h (struct __alloc_swap): Add, swaps allocators, optimized to nothing in case they are empty. * include/bits/stl_deque.h (deque<>::swap): Use it. * include/bits/stl_list.h (list<>::swap): Likewise. * include/bits/stl_tree.h (_Rb_tree<>::swap): Likewise. * include/bits/stl_vector.h (vector<>::swap): Likewise. * include/tr1/hashtable (hashtable<>::swap): Likewise. * include/ext/rc_string_base.h (__rc_string_base<>::_M_swap): Likewise. * include/ext/sso_string_base.h (__sso_string_base<>::_M_swap): Likewise. * include/ext/vstring_util.h (__vstring_utility<>::_Alloc_hider): Clean-up (now vstring uses the generic __alloc_swap facility). * include/tr1/unordered_map: Adjust includes. * include/tr1/unordered_set: Likewise. * docs/html/ext/howto.html: Add an entry for DR 431. * testsuite/23_containers/deque/modifiers/swap.cc: Move to... * testsuite/23_containers/deque/modifiers/swap/1.cc: ... here. * testsuite/23_containers/deque/modifiers/swap/2.cc: New. * testsuite/23_containers/deque/modifiers/swap/3.cc: New. * testsuite/23_containers/list/modifiers/swap.cc: Move to... * testsuite/23_containers/list/modifiers/swap/1.cc: ... here. * testsuite/23_containers/list/modifiers/swap/2.cc: New. * testsuite/23_containers/list/modifiers/swap/3.cc: New. * testsuite/23_containers/vector/modifiers/swap.cc: Move to... * testsuite/23_containers/vector/modifiers/swap/1.cc: ... here. * testsuite/23_containers/vector/modifiers/swap/2.cc: New. * testsuite/23_containers/vector/modifiers/swap/3.cc: New. * testsuite/23_containers/set/modifiers/swap.cc: Move to... * testsuite/23_containers/set/modifiers/swap/1.cc: ... here. * testsuite/23_containers/set/modifiers/swap/2.cc: New. * testsuite/23_containers/set/modifiers/swap/3.cc: New. * testsuite/23_containers/map/modifiers/swap.cc: Move to... * testsuite/23_containers/map/modifiers/swap/1.cc: ... here. * testsuite/23_containers/map/modifiers/swap/2.cc: New. * testsuite/23_containers/map/modifiers/swap/3.cc: New. * testsuite/23_containers/multiset/modifiers/swap.cc: Move to... * testsuite/23_containers/multiset/modifiers/swap/1.cc: ... here. * testsuite/23_containers/multiset/modifiers/swap/2.cc: New. * testsuite/23_containers/multiset/modifiers/swap/3.cc: New. * testsuite/23_containers/multimap/modifiers/swap.cc: Move to... * testsuite/23_containers/multimap/modifiers/swap/1.cc: ... here. * testsuite/23_containers/multimap/modifiers/swap/2.cc: New. * testsuite/23_containers/multimap/modifiers/swap/3.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_set/1.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_set/2.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_map/1.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_map/2.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_multiset/1.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_multiset/2.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_multimap/1.cc: New. * testsuite/tr1/6_containers/unordered/swap/unordered_multimap/2.cc: New. From-SVN: r109324
168 lines
5.7 KiB
C++
168 lines
5.7 KiB
C++
// TR1 unordered_map -*- C++ -*-
|
|
|
|
// Copyright (C) 2005, 2006 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
|
|
* This is a TR1 C++ Library header.
|
|
*/
|
|
|
|
#ifndef GNU_LIBSTDCXX_TR1_UNORDERED_MAP_
|
|
#define GNU_LIBSTDCXX_TR1_UNORDERED_MAP_
|
|
|
|
#include <tr1/hashtable>
|
|
#include <tr1/functional>
|
|
|
|
namespace std
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE(tr1)
|
|
|
|
// XXX When we get typedef templates these class definitions
|
|
// will be unnecessary.
|
|
|
|
template<class Key, class T,
|
|
class Hash = hash<Key>,
|
|
class Pred = std::equal_to<Key>,
|
|
class Alloc = std::allocator<std::pair<const Key, T> >,
|
|
bool cache_hash_code = false>
|
|
class unordered_map
|
|
: public hashtable <Key, std::pair<const Key, T>,
|
|
Alloc,
|
|
Internal::extract1st<std::pair<const Key, T> >, Pred,
|
|
Hash, Internal::mod_range_hashing,
|
|
Internal::default_ranged_hash,
|
|
Internal::prime_rehash_policy,
|
|
cache_hash_code, false, true>
|
|
{
|
|
typedef hashtable <Key, std::pair<const Key, T>,
|
|
Alloc,
|
|
Internal::extract1st<std::pair<const Key, T> >, Pred,
|
|
Hash, Internal::mod_range_hashing,
|
|
Internal::default_ranged_hash,
|
|
Internal::prime_rehash_policy,
|
|
cache_hash_code, false, true>
|
|
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;
|
|
|
|
explicit
|
|
unordered_map(size_type n = 10,
|
|
const hasher& hf = hasher(),
|
|
const key_equal& eql = key_equal(),
|
|
const allocator_type& a = allocator_type())
|
|
: Base(n, hf, Internal::mod_range_hashing(),
|
|
Internal::default_ranged_hash(),
|
|
eql, Internal::extract1st<std::pair<const Key, T> >(), a)
|
|
{ }
|
|
|
|
template<typename InputIterator>
|
|
unordered_map(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 (f, l, n, hf, Internal::mod_range_hashing(),
|
|
Internal::default_ranged_hash(),
|
|
eql, Internal::extract1st<std::pair<const Key, T> >(), a)
|
|
{ }
|
|
};
|
|
|
|
template<class Key, class T,
|
|
class Hash = hash<Key>,
|
|
class Pred = std::equal_to<Key>,
|
|
class Alloc = std::allocator<std::pair<const Key, T> >,
|
|
bool cache_hash_code = false>
|
|
class unordered_multimap
|
|
: public hashtable <Key, std::pair<const Key, T>,
|
|
Alloc,
|
|
Internal::extract1st<std::pair<const Key, T> >, Pred,
|
|
Hash, Internal::mod_range_hashing,
|
|
Internal::default_ranged_hash,
|
|
Internal::prime_rehash_policy,
|
|
cache_hash_code, false, false>
|
|
{
|
|
typedef hashtable <Key, std::pair<const Key, T>,
|
|
Alloc,
|
|
Internal::extract1st<std::pair<const Key, T> >, Pred,
|
|
Hash, Internal::mod_range_hashing,
|
|
Internal::default_ranged_hash,
|
|
Internal::prime_rehash_policy,
|
|
cache_hash_code, false, false>
|
|
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;
|
|
|
|
explicit
|
|
unordered_multimap(size_type n = 10,
|
|
const hasher& hf = hasher(),
|
|
const key_equal& eql = key_equal(),
|
|
const allocator_type& a = allocator_type())
|
|
: Base (n, hf, Internal::mod_range_hashing(),
|
|
Internal::default_ranged_hash(),
|
|
eql, Internal::extract1st<std::pair<const Key, T> >(), a)
|
|
{ }
|
|
|
|
|
|
template<typename InputIterator>
|
|
unordered_multimap(InputIterator f, InputIterator l,
|
|
typename Base::size_type n = 0,
|
|
const hasher& hf = hasher(),
|
|
const key_equal& eql = key_equal(),
|
|
const allocator_type& a = allocator_type())
|
|
: Base (f, l, n, hf, Internal::mod_range_hashing(),
|
|
Internal::default_ranged_hash(),
|
|
eql, Internal::extract1st<std::pair<const Key, T> >(), a)
|
|
{ }
|
|
};
|
|
|
|
template<class Key, class T, class Hash, class Pred, class Alloc,
|
|
bool cache_hash_code>
|
|
inline void
|
|
swap(unordered_map<Key, T, Hash, Pred, Alloc, cache_hash_code>& x,
|
|
unordered_map<Key, T, Hash, Pred, Alloc, cache_hash_code>& y)
|
|
{ x.swap(y); }
|
|
|
|
template<class Key, class T, class Hash, class Pred, class Alloc,
|
|
bool cache_hash_code>
|
|
inline void
|
|
swap(unordered_multimap<Key, T, Hash, Pred, Alloc, cache_hash_code>& x,
|
|
unordered_multimap<Key, T, Hash, Pred, Alloc, cache_hash_code>& y)
|
|
{ x.swap(y); }
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
}
|
|
|
|
#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ */
|