diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-15 16:18:22 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-15 16:18:22 +0000 |
| commit | 20c854948b084a4b8a7c22b43293435b00d9e6a1 (patch) | |
| tree | 496b9edc22b7174ef4c790fb8021fb3ad1e88162 /libstdc++-v3 | |
| parent | d0b62076846630e112257e8891445b49ed009ef3 (diff) | |
| download | gcc-20c854948b084a4b8a7c22b43293435b00d9e6a1.tar.gz | |
2011-04-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/istream: Fix comments in the light of DR60 + N3168.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172500 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/istream | 29 |
2 files changed, 20 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index eb87a87ce4c..0732a9ea97d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-04-15 Paolo Carlini <paolo.carlini@oracle.com> + + * include/std/istream: Fix comments in the light of DR60 + N3168. + 2011-04-13 Daniel Krugler <daniel.kruegler@googlemail.com> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index ded483349b1..fb393921fd9 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -495,8 +495,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in * the error state. * - * @note Since no characters are extracted, the next call to - * @c gcount() will return 0, as required by DR 60. + * @note This function first clears eofbit. Since no characters + * are extracted, the next call to @c gcount() will return 0, + * as required by DR 60. */ __istream_type& putback(char_type __c); @@ -510,8 +511,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * If @c rdbuf() is null or if @c sungetc() fails, sets badbit in * the error state. * - * @note Since no characters are extracted, the next call to - * @c gcount() will return 0, as required by DR 60. + * @note This function first clears eofbit. Since no characters + * are extracted, the next call to @c gcount() will return 0, + * as required by DR 60. */ __istream_type& unget(); @@ -543,9 +545,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * @note This function does not count the number of characters * extracted, if any, and therefore does not affect the next - * call to @c gcount(). + * call to @c gcount(). At variance with putback, unget and + * seekg, eofbit is not cleared first. */ - pos_type + pos_type tellg(); /** @@ -556,11 +559,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos). If * that function fails, sets failbit. * - * @note This function does not count the number of characters - * extracted, if any, and therefore does not affect the next - * call to @c gcount(). + * @note This function first clears eofbit. It does not count the + * number of characters extracted, if any, and therefore does + * not affect the next call to @c gcount(). */ - __istream_type& + __istream_type& seekg(pos_type); /** @@ -572,9 +575,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir). * If that function fails, sets failbit. * - * @note This function does not count the number of characters - * extracted, if any, and therefore does not affect the next - * call to @c gcount(). + * @note This function first clears eofbit. It does not count the + * number of characters extracted, if any, and therefore does + * not affect the next call to @c gcount(). */ __istream_type& seekg(off_type, ios_base::seekdir); |