OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hashtable: Trivial formatting fixes. 

2005-06-15  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/hashtable: Trivial formatting fixes.
	* include/tr1/unordered_map: Likewise.
	* include/tr1/unordered_set: Likewise.

From-SVN: r100988
This commit is contained in:
Paolo Carlini 2005-06-15 17:48:00 +00:00 committed by Paolo Carlini
parent 63a4ef6f54
commit 7ffd2d94ca
4 changed files with 1749 additions and 1464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2005-06-15 Paolo Carlini <pcarlini@suse.de>
* include/tr1/hashtable: Trivial formatting fixes.
* include/tr1/unordered_map: Likewise.
* include/tr1/unordered_set: Likewise.
2005-06-14 Tom Tromey <tromey@redhat.com>
PR libgcj/19877:

2762
libstdc++-v3/include/tr1/hashtable
View File

File diff suppressed because it is too large Load Diff

226
libstdc++-v3/include/tr1/unordered_map
View File

@ -40,127 +40,131 @@
#include <utility>
#include <memory>
namespace std { 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, true, true>
namespace std
{
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, true, true>
Base;
namespace tr1
{
// XXX When we get typedef templates these class definitions
// will be unnecessary.
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;
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, true, 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, true, true>
Base;
explicit unordered_map(size_type n = 10,
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, true, 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, true, 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_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, true, 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, true, 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)
{ }
: 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<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); }
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);
}
} }
#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_MAP_ */

219
libstdc++-v3/include/tr1/unordered_set
View File

@ -38,123 +38,128 @@
#include <tr1/functional>
#include <memory>
namespace std { namespace tr1 {
// XXX When we get typedef templates these class definitions will be unnecessary.
template <class Value,
class Hash = hash<Value>,
class Pred = std::equal_to<Value>,
class Alloc = std::allocator<Value>,
bool cache_hash_code = false>
class unordered_set
: public hashtable <Value, Value, Alloc,
Internal::identity<Value>, Pred,
Hash, Internal::mod_range_hashing, Internal::default_ranged_hash,
Internal::prime_rehash_policy,
cache_hash_code, false, true>
namespace std
{
namespace tr1
{
typedef hashtable <Value, Value, Alloc,
Internal::identity<Value>, 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;
// XXX When we get typedef templates these class definitions
// will be unnecessary.
explicit unordered_set(size_type n = 10,
template<class Value,
class Hash = hash<Value>,
class Pred = std::equal_to<Value>,
class Alloc = std::allocator<Value>,
bool cache_hash_code = false>
class unordered_set
: public hashtable<Value, Value, Alloc,
Internal::identity<Value>, Pred,
Hash, Internal::mod_range_hashing,
Internal::default_ranged_hash,
Internal::prime_rehash_policy,
cache_hash_code, false, true>
{
typedef hashtable<Value, Value, Alloc,
Internal::identity<Value>, 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_set(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::identity<Value>(), 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 (f, l, n, hf, Internal::mod_range_hashing(),
Internal::default_ranged_hash(),
eql, Internal::identity<Value>(), a)
{ }
};
template<class Value,
class Hash = hash<Value>,
class Pred = std::equal_to<Value>,
class Alloc = std::allocator<Value>,
bool cache_hash_code = false>
class unordered_multiset
: public hashtable <Value, Value, Alloc,
Internal::identity<Value>, Pred,
Hash, Internal::mod_range_hashing,
Internal::default_ranged_hash,
Internal::prime_rehash_policy,
cache_hash_code, false, false>
{
typedef hashtable<Value, Value, Alloc,
Internal::identity<Value>, 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_multiset(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::identity<Value>(),
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 (f, l,
n,
hf, Internal::mod_range_hashing(), Internal::default_ranged_hash(),
eql, Internal::identity<Value>(),
a)
{ }
};
template <class Value,
class Hash = hash<Value>,
class Pred = std::equal_to<Value>,
class Alloc = std::allocator<Value>,
bool cache_hash_code = false>
class unordered_multiset
: public hashtable <Value, Value, Alloc,
Internal::identity<Value>, Pred,
Hash, Internal::mod_range_hashing, Internal::default_ranged_hash,
Internal::prime_rehash_policy,
cache_hash_code, false, false>
{
typedef hashtable <Value, Value, Alloc,
Internal::identity<Value>, 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_multiset(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::identity<Value>(),
a)
{ }
: Base (n, hf, Internal::mod_range_hashing(),
Internal::default_ranged_hash(),
eql, Internal::identity<Value>(), a)
{ }
template <typename InputIterator>
unordered_multiset(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::identity<Value>(),
a)
{ }
};
template<typename InputIterator>
unordered_multiset(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::identity<Value>(), a)
{ }
};
template<class Value, class Hash, class Pred, class Alloc,
bool cache_hash_code>
inline void
swap (unordered_set<Value, Hash, Pred, Alloc, cache_hash_code>& x,
unordered_set<Value, Hash, Pred, Alloc, cache_hash_code>& y)
{ x.swap(y); }
template<class Value, class Hash, class Pred, class Alloc,
bool cache_hash_code>
inline void
swap(unordered_multiset<Value, Hash, Pred, Alloc, cache_hash_code>& x,
unordered_multiset<Value, Hash, Pred, Alloc, cache_hash_code>& y)
{ x.swap(y); }
template <class Value, class Hash, class Pred, class Alloc, bool cache_hash_code>
inline void swap (unordered_set<Value, Hash, Pred, Alloc, cache_hash_code>& x,
unordered_set<Value, Hash, Pred, Alloc, cache_hash_code>& y)
{
x.swap(y);
}
template <class Value, class Hash, class Pred, class Alloc, bool cache_hash_code>
inline void swap (unordered_multiset<Value, Hash, Pred, Alloc, cache_hash_code>& x,
unordered_multiset<Value, Hash, Pred, Alloc, cache_hash_code>& y)
{
x.swap(y);
}
} }
#endif /* GNU_LIBSTDCXX_TR1_UNORDERED_SET_ */