mirror of git://gcc.gnu.org/git/gcc.git
hashtable (hashtable_iterator<>::hashtable_iterator(), [...]): Add.
2006-05-10 Paolo Carlini <pcarlini@suse.de> Peter Doerfler <gcc@pdoerfler.com> * include/tr1/hashtable (hashtable_iterator<>::hashtable_iterator(), hashtable_const_iterator<>::hashtable_const_iterator(), node_iterator<>::node_iterator(), node_const_iterator<>::node_const_iterator()): Add. (node_iterator<>::node_iterator(hash_node<>*), node_const_iterator<>::node_const_iterator(hash_node<>*)): Tweak, remove default. * testsuite/tr1/6_containers/unordered/hashtable/ iterators_default_constructor.c: New. Co-Authored-By: Peter Doerfler <gcc@pdoerfler.com> From-SVN: r113681
This commit is contained in:
parent
3a7e3b6994
commit
0fc125eaee
|
|
@ -1,3 +1,16 @@
|
||||||
|
2006-05-10 Paolo Carlini <pcarlini@suse.de>
|
||||||
|
Peter Doerfler <gcc@pdoerfler.com>
|
||||||
|
|
||||||
|
* include/tr1/hashtable (hashtable_iterator<>::hashtable_iterator(),
|
||||||
|
hashtable_const_iterator<>::hashtable_const_iterator(),
|
||||||
|
node_iterator<>::node_iterator(),
|
||||||
|
node_const_iterator<>::node_const_iterator()): Add.
|
||||||
|
(node_iterator<>::node_iterator(hash_node<>*),
|
||||||
|
node_const_iterator<>::node_const_iterator(hash_node<>*)): Tweak,
|
||||||
|
remove default.
|
||||||
|
* testsuite/tr1/6_containers/unordered/hashtable/
|
||||||
|
iterators_default_constructor.c: New.
|
||||||
|
|
||||||
2006-05-10 Marc Glisse <marc.glisse@normalesup.org>
|
2006-05-10 Marc Glisse <marc.glisse@normalesup.org>
|
||||||
|
|
||||||
* include/ext/pool_allocator.h: Add missing std:: qualifications.
|
* include/ext/pool_allocator.h: Add missing std:: qualifications.
|
||||||
|
|
|
||||||
|
|
@ -171,8 +171,11 @@ namespace Internal
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
typedef std::forward_iterator_tag iterator_category;
|
typedef std::forward_iterator_tag iterator_category;
|
||||||
|
|
||||||
|
node_iterator()
|
||||||
|
: node_iterator_base<Value, cache>(0) { }
|
||||||
|
|
||||||
explicit
|
explicit
|
||||||
node_iterator(hash_node<Value, cache>* p = 0)
|
node_iterator(hash_node<Value, cache>* p)
|
||||||
: node_iterator_base<Value, cache>(p) { }
|
: node_iterator_base<Value, cache>(p) { }
|
||||||
|
|
||||||
reference
|
reference
|
||||||
|
|
@ -209,8 +212,11 @@ namespace Internal
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
typedef std::forward_iterator_tag iterator_category;
|
typedef std::forward_iterator_tag iterator_category;
|
||||||
|
|
||||||
|
node_const_iterator()
|
||||||
|
: node_iterator_base<Value, cache>(0) { }
|
||||||
|
|
||||||
explicit
|
explicit
|
||||||
node_const_iterator(hash_node<Value, cache>* p = 0)
|
node_const_iterator(hash_node<Value, cache>* p)
|
||||||
: node_iterator_base<Value, cache>(p) { }
|
: node_iterator_base<Value, cache>(p) { }
|
||||||
|
|
||||||
node_const_iterator(const node_iterator<Value, constant_iterators,
|
node_const_iterator(const node_iterator<Value, constant_iterators,
|
||||||
|
|
@ -246,8 +252,7 @@ namespace Internal
|
||||||
{
|
{
|
||||||
hashtable_iterator_base(hash_node<Value, cache>* node,
|
hashtable_iterator_base(hash_node<Value, cache>* node,
|
||||||
hash_node<Value, cache>** bucket)
|
hash_node<Value, cache>** bucket)
|
||||||
: m_cur_node(node), m_cur_bucket(bucket)
|
: m_cur_node(node), m_cur_bucket(bucket) { }
|
||||||
{ }
|
|
||||||
|
|
||||||
void
|
void
|
||||||
incr()
|
incr()
|
||||||
|
|
@ -303,6 +308,9 @@ namespace Internal
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
typedef std::forward_iterator_tag iterator_category;
|
typedef std::forward_iterator_tag iterator_category;
|
||||||
|
|
||||||
|
hashtable_iterator()
|
||||||
|
: hashtable_iterator_base<Value, cache>(0, 0) { }
|
||||||
|
|
||||||
hashtable_iterator(hash_node<Value, cache>* p,
|
hashtable_iterator(hash_node<Value, cache>* p,
|
||||||
hash_node<Value, cache>** b)
|
hash_node<Value, cache>** b)
|
||||||
: hashtable_iterator_base<Value, cache>(p, b) { }
|
: hashtable_iterator_base<Value, cache>(p, b) { }
|
||||||
|
|
@ -310,7 +318,7 @@ namespace Internal
|
||||||
explicit
|
explicit
|
||||||
hashtable_iterator(hash_node<Value, cache>** b)
|
hashtable_iterator(hash_node<Value, cache>** b)
|
||||||
: hashtable_iterator_base<Value, cache>(*b, b) { }
|
: hashtable_iterator_base<Value, cache>(*b, b) { }
|
||||||
|
|
||||||
reference
|
reference
|
||||||
operator*() const
|
operator*() const
|
||||||
{ return this->m_cur_node->m_v; }
|
{ return this->m_cur_node->m_v; }
|
||||||
|
|
@ -345,6 +353,9 @@ namespace Internal
|
||||||
typedef std::ptrdiff_t difference_type;
|
typedef std::ptrdiff_t difference_type;
|
||||||
typedef std::forward_iterator_tag iterator_category;
|
typedef std::forward_iterator_tag iterator_category;
|
||||||
|
|
||||||
|
hashtable_const_iterator()
|
||||||
|
: hashtable_iterator_base<Value, cache>(0, 0) { }
|
||||||
|
|
||||||
hashtable_const_iterator(hash_node<Value, cache>* p,
|
hashtable_const_iterator(hash_node<Value, cache>* p,
|
||||||
hash_node<Value, cache>** b)
|
hash_node<Value, cache>** b)
|
||||||
: hashtable_iterator_base<Value, cache>(p, b) { }
|
: hashtable_iterator_base<Value, cache>(p, b) { }
|
||||||
|
|
@ -352,7 +363,7 @@ namespace Internal
|
||||||
explicit
|
explicit
|
||||||
hashtable_const_iterator(hash_node<Value, cache>** b)
|
hashtable_const_iterator(hash_node<Value, cache>** b)
|
||||||
: hashtable_iterator_base<Value, cache>(*b, b) { }
|
: hashtable_iterator_base<Value, cache>(*b, b) { }
|
||||||
|
|
||||||
hashtable_const_iterator(const hashtable_iterator<Value,
|
hashtable_const_iterator(const hashtable_iterator<Value,
|
||||||
constant_iterators, cache>& x)
|
constant_iterators, cache>& x)
|
||||||
: hashtable_iterator_base<Value, cache>(x.m_cur_node, x.m_cur_bucket) { }
|
: hashtable_iterator_base<Value, cache>(x.m_cur_node, x.m_cur_bucket) { }
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
// Copyright (C) 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.
|
||||||
|
|
||||||
|
// 6.3 Unordered associative containers
|
||||||
|
|
||||||
|
#include <tr1/unordered_set>
|
||||||
|
|
||||||
|
void
|
||||||
|
test01()
|
||||||
|
{
|
||||||
|
std::tr1::unordered_set<int>::iterator it;
|
||||||
|
std::tr1::unordered_set<int>::const_iterator cit;
|
||||||
|
std::tr1::unordered_set<int>::local_iterator lit;
|
||||||
|
std::tr1::unordered_set<int>::const_local_iterator clit;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue