diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2001-06-26 09:41:53 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-06-26 09:41:53 +0000 |
| commit | f4655693b5aff2a21929d4c127b89a0fc9803a49 (patch) | |
| tree | 276878e6d3c791f24ee84992994555dbaa81f3d1 /libstdc++-v3 | |
| parent | 0deaa8136a6dd572b0b6c33ef8768937e61f608f (diff) | |
| download | gcc-f4655693b5aff2a21929d4c127b89a0fc9803a49.zip gcc-f4655693b5aff2a21929d4c127b89a0fc9803a49.tar.gz gcc-f4655693b5aff2a21929d4c127b89a0fc9803a49.tar.bz2 | |
stl_iterator.h (istream_iterator::operator->): Fix return values.
2001-06-26 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/stl_iterator.h (istream_iterator::operator->): Fix
return values.
(istream_iterator::operator*): Same.
2001-06-26 Benjamin Kosnik <bkoz@redhat.com>
Alexandre Petit-Bianco <apbianco@redhat.com>
* testsuite/21_strings/element_access.cc (test01): Chill Out Cafe
is on 41st, not 14th.
Co-Authored-By: Alexandre Petit-Bianco <apbianco@redhat.com>
From-SVN: r43574
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 12 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_iterator.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/element_access.cc | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0920104..73d26c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,17 @@ 2001-06-26 Benjamin Kosnik <bkoz@redhat.com> + * include/bits/stl_iterator.h (istream_iterator::operator->): Fix + return values. + (istream_iterator::operator*): Same. + +2001-06-26 Benjamin Kosnik <bkoz@redhat.com> + Alexandre Petit-Bianco <apbianco@redhat.com> + + * testsuite/21_strings/element_access.cc (test01): Chill Out Cafe + is on 41st, not 14th. + +2001-06-26 Benjamin Kosnik <bkoz@redhat.com> + * include/bits/std_iterator.h: Include sbuf_iter.h via std_ios.h. * include/bits/stl_iterator.h (istream_iterator): Inherit from diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index a50b353..d46efa7 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -295,10 +295,10 @@ namespace std istream_iterator() : _M_stream(0), _M_ok(false) {} istream_iterator(istream_type& __s) : _M_stream(&__s) { _M_read(); } - reference + const _Tp& operator*() const { return _M_value; } - pointer + const _Tp* operator->() const { return &(operator*()); } istream_iterator& diff --git a/libstdc++-v3/testsuite/21_strings/element_access.cc b/libstdc++-v3/testsuite/21_strings/element_access.cc index 4deabda1..88b10a2 100644 --- a/libstdc++-v3/testsuite/21_strings/element_access.cc +++ b/libstdc++-v3/testsuite/21_strings/element_access.cc @@ -34,7 +34,7 @@ bool test01(void) csize_type csz01, csz02; const std::string str01("tamarindo, costa rica"); - std::string str02("14th street beach, capitola, california"); + std::string str02("41st street beach, capitola, california"); std::string str03; // const_reference operator[] (size_type pos) const; @@ -49,7 +49,7 @@ bool test01(void) ref ref1 = str02[csz02 - 1]; VERIFY( ref1 == 'a' ); ref ref2 = str02[1]; - VERIFY( ref2 == '4' ); + VERIFY( ref2 == '1' ); // const_reference at(size_type pos) const; csz01 = str01.size(); |