Commit b3b66298 by Paolo Carlini Committed by Paolo Carlini

istream: Fix comments in the light of DR60 + N3168.

2011-04-15  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/istream: Fix comments in the light of DR60 + N3168.

From-SVN: r172500
parent 7e3d293f
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> 2011-04-13 Daniel Krugler <daniel.kruegler@googlemail.com>
Paolo Carlini <paolo.carlini@oracle.com> Paolo Carlini <paolo.carlini@oracle.com>
......
...@@ -495,8 +495,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -495,8 +495,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in * If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in
* the error state. * the error state.
* *
* @note Since no characters are extracted, the next call to * @note This function first clears eofbit. Since no characters
* @c gcount() will return 0, as required by DR 60. * are extracted, the next call to @c gcount() will return 0,
* as required by DR 60.
*/ */
__istream_type& __istream_type&
putback(char_type __c); putback(char_type __c);
...@@ -510,8 +511,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -510,8 +511,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* If @c rdbuf() is null or if @c sungetc() fails, sets badbit in * If @c rdbuf() is null or if @c sungetc() fails, sets badbit in
* the error state. * the error state.
* *
* @note Since no characters are extracted, the next call to * @note This function first clears eofbit. Since no characters
* @c gcount() will return 0, as required by DR 60. * are extracted, the next call to @c gcount() will return 0,
* as required by DR 60.
*/ */
__istream_type& __istream_type&
unget(); unget();
...@@ -543,9 +545,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -543,9 +545,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* *
* @note This function does not count the number of characters * @note This function does not count the number of characters
* extracted, if any, and therefore does not affect the next * 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(); tellg();
/** /**
...@@ -556,11 +559,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -556,11 +559,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos). If * If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos). If
* that function fails, sets failbit. * that function fails, sets failbit.
* *
* @note This function does not count the number of characters * @note This function first clears eofbit. It does not count the
* extracted, if any, and therefore does not affect the next * number of characters extracted, if any, and therefore does
* call to @c gcount(). * not affect the next call to @c gcount().
*/ */
__istream_type& __istream_type&
seekg(pos_type); seekg(pos_type);
/** /**
...@@ -572,9 +575,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -572,9 +575,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir). * If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
* If that function fails, sets failbit. * If that function fails, sets failbit.
* *
* @note This function does not count the number of characters * @note This function first clears eofbit. It does not count the
* extracted, if any, and therefore does not affect the next * number of characters extracted, if any, and therefore does
* call to @c gcount(). * not affect the next call to @c gcount().
*/ */
__istream_type& __istream_type&
seekg(off_type, ios_base::seekdir); seekg(off_type, ios_base::seekdir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment