From Jason Turner

[istream]

Diff to HTML by rtfpessoa

tmp/tmpztdyoali/{from.md → to.md} RENAMED
@@ -12,13 +12,13 @@ namespace std {
12
  template<class charT, class traits = char_traits<charT>>
13
  class basic_istream : virtual public basic_ios<charT, traits> {
14
  public:
15
  // types (inherited from basic_ios[ios])
16
  using char_type = charT;
17
- using int_type = typename traits::int_type;
18
- using pos_type = typename traits::pos_type;
19
- using off_type = typename traits::off_type;
20
  using traits_type = traits;
21
 
22
  // [istream.cons], constructor/destructor
23
  explicit basic_istream(basic_streambuf<charT, traits>* sb);
24
  virtual ~basic_istream();
@@ -59,10 +59,11 @@ namespace std {
59
 
60
  basic_istream& getline(char_type* s, streamsize n);
61
  basic_istream& getline(char_type* s, streamsize n, char_type delim);
62
 
63
  basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
 
64
  int_type peek();
65
  basic_istream& read (char_type* s, streamsize n);
66
  streamsize readsome(char_type* s, streamsize n);
67
 
68
  basic_istream& putback(char_type c);
@@ -140,11 +141,11 @@ virtual ~basic_istream();
140
 
141
  ``` cpp
142
  basic_istream& operator=(basic_istream&& rhs);
143
  ```
144
 
145
- *Effects:* Equivalent to: `swap(rhs)`.
146
 
147
  *Returns:* `*this`.
148
 
149
  ``` cpp
150
  void swap(basic_istream& rhs);
@@ -212,12 +213,12 @@ const ctype<charT>& ctype = use_facet<ctype<charT>>(is.getloc());
212
  if (ctype.is(ctype.space, c) != 0)
213
  // c is a whitespace character.
214
  ```
215
 
216
  If, after any preparation is completed, `is.good()` is `true`,
217
- `ok_ != false` otherwise, `ok_ == false`. During preparation, the
218
- constructor may call `setstate(failbit)` (which may throw
219
  `ios_base::failure` [[iostate.flags]]).[^19]
220
 
221
  ``` cpp
222
  ~sentry();
223
  ```
@@ -226,7 +227,7 @@ constructor may call `setstate(failbit)` (which may throw
226
 
227
  ``` cpp
228
  explicit operator bool() const;
229
  ```
230
 
231
- *Returns:* `ok_`.
232
 
 
12
  template<class charT, class traits = char_traits<charT>>
13
  class basic_istream : virtual public basic_ios<charT, traits> {
14
  public:
15
  // types (inherited from basic_ios[ios])
16
  using char_type = charT;
17
+ using int_type = traits::int_type;
18
+ using pos_type = traits::pos_type;
19
+ using off_type = traits::off_type;
20
  using traits_type = traits;
21
 
22
  // [istream.cons], constructor/destructor
23
  explicit basic_istream(basic_streambuf<charT, traits>* sb);
24
  virtual ~basic_istream();
 
59
 
60
  basic_istream& getline(char_type* s, streamsize n);
61
  basic_istream& getline(char_type* s, streamsize n, char_type delim);
62
 
63
  basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
64
+ basic_istream& ignore(streamsize n, char_type delim);
65
  int_type peek();
66
  basic_istream& read (char_type* s, streamsize n);
67
  streamsize readsome(char_type* s, streamsize n);
68
 
69
  basic_istream& putback(char_type c);
 
141
 
142
  ``` cpp
143
  basic_istream& operator=(basic_istream&& rhs);
144
  ```
145
 
146
+ *Effects:* Equivalent to `swap(rhs)`.
147
 
148
  *Returns:* `*this`.
149
 
150
  ``` cpp
151
  void swap(basic_istream& rhs);
 
213
  if (ctype.is(ctype.space, c) != 0)
214
  // c is a whitespace character.
215
  ```
216
 
217
  If, after any preparation is completed, `is.good()` is `true`,
218
+ *`ok_`*` != false` otherwise, *`ok_`*` == false`. During preparation,
219
+ the constructor may call `setstate(failbit)` (which may throw
220
  `ios_base::failure` [[iostate.flags]]).[^19]
221
 
222
  ``` cpp
223
  ~sentry();
224
  ```
 
227
 
228
  ``` cpp
229
  explicit operator bool() const;
230
  ```
231
 
232
+ *Returns:* *ok\_*.
233