1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From 6cd1f8146545d6f82269c9a96a05438a06fcdc1a Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 15 Apr 2011 16:19:39 +0000
Subject: [PATCH 126/200] 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/branches/gcc-4_6-branch@172501 138bc75d-0d04-0410-961f-82ee72b054a4
index ded4833..fb39392 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);
--
1.7.0.4
|
