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

[multiple changes] 

2003-05-29  Sylvain Pion  <Sylvain.Pion@mpi-sb.mpg.de>

	PR libstdc++/10783
	* include/bits/stl_iterator.h (class __normal_iterator):
	Don't inherit from iterator, add missing typedefs.

2003-05-29  Paolo Carlini <pcarlini@unitus.it>

	* testsuite/24_iterators/reverse_iterator.cc: Split up, as follows.
	* testsuite/24_iterators/reverse_iterator/1.cc: New.
	* testsuite/24_iterators/reverse_iterator/2.cc: New.
	* testsuite/24_iterators/reverse_iterator/3.cc: New, from
	PR libstdc++/10783.

From-SVN: r67223
This commit is contained in:
Paolo Carlini 2003-05-29 12:21:26 +00:00
parent 5f52c0e090
commit 86f6262d61
5 changed files with 112 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2003-05-29 Sylvain Pion <Sylvain.Pion@mpi-sb.mpg.de>
PR libstdc++/10783
* include/bits/stl_iterator.h (class __normal_iterator):
Don't inherit from iterator, add missing typedefs.
2003-05-29 Paolo Carlini <pcarlini@unitus.it>
* testsuite/24_iterators/reverse_iterator.cc: Split up, as follows.
* testsuite/24_iterators/reverse_iterator/1.cc: New.
* testsuite/24_iterators/reverse_iterator/2.cc: New.
* testsuite/24_iterators/reverse_iterator/3.cc: New, from
PR libstdc++/10783.
2003-05-27 Steve Ellcey <sje@cup.hp.com>
* config/os/hpux/os_defines.h: Define _LIBUNWIND_STD_ABI if we are

8
libstdc++-v3/include/bits/stl_iterator.h
View File

@ -569,16 +569,14 @@ namespace __gnu_cxx
using std::iterator;
template<typename _Iterator, typename _Container>
class __normal_iterator
: public iterator<typename iterator_traits<_Iterator>::iterator_category,
typename iterator_traits<_Iterator>::value_type,
typename iterator_traits<_Iterator>::difference_type,
typename iterator_traits<_Iterator>::pointer,
typename iterator_traits<_Iterator>::reference>
{
protected:
_Iterator _M_current;
public:
typedef typename iterator_traits<_Iterator>::iterator_category
iterator_category;
typedef typename iterator_traits<_Iterator>::value_type value_type;
typedef typename iterator_traits<_Iterator>::difference_type
difference_type;
typedef typename iterator_traits<_Iterator>::reference reference;

29
libstdc++-v3/testsuite/24_iterators/reverse_iterator.cc → libstdc++-v3/testsuite/24_iterators/reverse_iterator/1.cc
View File

@ -1,6 +1,6 @@
// 2001-06-21 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
// Copyright (C) 2001, 2002, 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
@ -46,38 +46,11 @@ void test01()
typedef test_iterator::iterator_category iteratory_category;
}
// Make sure iterator can be instantiated.
template class std::reverse_iterator<int*>;
void test02()
{
typedef std::reverse_iterator<int*> iterator_type;
iterator_type it01;
iterator_type it02;
// Sanity check non-member operators and functions can be instantiated.
it01 == it02;
it01 != it02;
it01 < it02;
it01 <= it02;
it01 > it02;
it01 >= it02;
it01 - it02;
5 + it02;
}
// Check data member 'current' accessible.
class test_dm : public std::reverse_iterator<int*>
{
int* p;
public:
test_dm(): p(current) { }
};
int main()
{
test01();
test02();
return 0;
}

54
libstdc++-v3/testsuite/24_iterators/reverse_iterator/2.cc Normal file
View File

@ -0,0 +1,54 @@
// 2001-06-21 Benjamin Kosnik <bkoz@redhat.com>
// Copyright (C) 2001, 2002, 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.
// 24.4.1.2 Reverse iterators
#include <iterator>
void test02()
{
typedef std::reverse_iterator<int*> iterator_type;
iterator_type it01;
iterator_type it02;
// Sanity check non-member operators and functions can be instantiated.
it01 == it02;
it01 != it02;
it01 < it02;
it01 <= it02;
it01 > it02;
it01 >= it02;
it01 - it02;
5 + it02;
}
// Check data member 'current' accessible.
class test_dm : public std::reverse_iterator<int*>
{
int* p;
public:
test_dm(): p(current) { }
};
int main()
{
test02();
return 0;
}

40
libstdc++-v3/testsuite/24_iterators/reverse_iterator/3.cc Normal file
View File

@ -0,0 +1,40 @@
// 2003-05-29 Paolo Carlini <pcarlini@unitus.it>
// 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.
// 24.4.1.2 Reverse iterators
#include <iterator>
#include <vector>
#include <testsuite_hooks.h>
// libstdc++/10783
void test03()
{
bool test = true;
typedef std::vector<int> V;
VERIFY( sizeof(V::iterator) == sizeof(V::reverse_iterator) );
}
int main()
{
test03();
return 0;
}