From Jason Turner

[istream.general]

Diff to HTML by rtfpessoa

tmp/tmpi5ds3ysd/{from.md → to.md} RENAMED
@@ -10,13 +10,13 @@ namespace std {
10
  template<class charT, class traits = char_traits<charT>>
11
  class basic_istream : virtual public basic_ios<charT, traits> {
12
  public:
13
  // types (inherited from basic_ios[ios])
14
  using char_type = charT;
15
- using int_type = typename traits::int_type;
16
- using pos_type = typename traits::pos_type;
17
- using off_type = typename traits::off_type;
18
  using traits_type = traits;
19
 
20
  // [istream.cons], constructor/destructor
21
  explicit basic_istream(basic_streambuf<charT, traits>* sb);
22
  virtual ~basic_istream();
@@ -57,10 +57,11 @@ namespace std {
57
 
58
  basic_istream& getline(char_type* s, streamsize n);
59
  basic_istream& getline(char_type* s, streamsize n, char_type delim);
60
 
61
  basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
 
62
  int_type peek();
63
  basic_istream& read (char_type* s, streamsize n);
64
  streamsize readsome(char_type* s, streamsize n);
65
 
66
  basic_istream& putback(char_type c);
 
10
  template<class charT, class traits = char_traits<charT>>
11
  class basic_istream : virtual public basic_ios<charT, traits> {
12
  public:
13
  // types (inherited from basic_ios[ios])
14
  using char_type = charT;
15
+ using int_type = traits::int_type;
16
+ using pos_type = traits::pos_type;
17
+ using off_type = traits::off_type;
18
  using traits_type = traits;
19
 
20
  // [istream.cons], constructor/destructor
21
  explicit basic_istream(basic_streambuf<charT, traits>* sb);
22
  virtual ~basic_istream();
 
57
 
58
  basic_istream& getline(char_type* s, streamsize n);
59
  basic_istream& getline(char_type* s, streamsize n, char_type delim);
60
 
61
  basic_istream& ignore(streamsize n = 1, int_type delim = traits::eof());
62
+ basic_istream& ignore(streamsize n, char_type delim);
63
  int_type peek();
64
  basic_istream& read (char_type* s, streamsize n);
65
  streamsize readsome(char_type* s, streamsize n);
66
 
67
  basic_istream& putback(char_type c);