diff options
author | Paolo Carlini <pcarlini@suse.de> | 2005-01-11 16:48:14 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-01-11 16:48:14 +0000 |
commit | a141a5afe1176f2fa8bf7a7383223df55fdef623 (patch) | |
tree | 1c942ddec4a4c9fb5c671be6f9e3451e07a07c8f | |
parent | a969c1d23b142de977b07ce0d7a018fb4aab3893 (diff) | |
download | gcc-a141a5afe1176f2fa8bf7a7383223df55fdef623.zip gcc-a141a5afe1176f2fa8bf7a7383223df55fdef623.tar.gz gcc-a141a5afe1176f2fa8bf7a7383223df55fdef623.tar.bz2 |
istream.cc (basic_istream<char>::ignore(streamsize), [...]): Revert 2005-01-05 change...
2005-01-11 Paolo Carlini <pcarlini@suse.de>
* src/istream.cc (basic_istream<char>::ignore(streamsize),
basic_istream<char>::ignore(streamsize, int_type),
basic_istream<wchar_t>::ignore(streamsize),
basic_istream<wchar_t>::ignore(streamsize, int_type)): Revert
2005-01-05 change: actually, the previous behavior is conforming
and consistent with that of get(char_type*, streamsize, char_type),
albeit slightly different from that of 3.3/3.4 in a corner case
due to the use of snextc.
* include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
int_type)): Likewise.
* testsuite/27_io/basic_istream/ignore/char/4.cc: Remove.
* testsuite/27_io/basic_istream/ignore/wchar_t/4.cc: Likewise.
From-SVN: r93189
-rw-r--r-- | libstdc++-v3/ChangeLog | 15 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/istream.tcc | 8 | ||||
-rw-r--r-- | libstdc++-v3/src/istream.cc | 16 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/4.cc | 59 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/4.cc | 59 |
5 files changed, 24 insertions, 133 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bb1599c..434f487 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,20 @@ 2005-01-11 Paolo Carlini <pcarlini@suse.de> + * src/istream.cc (basic_istream<char>::ignore(streamsize), + basic_istream<char>::ignore(streamsize, int_type), + basic_istream<wchar_t>::ignore(streamsize), + basic_istream<wchar_t>::ignore(streamsize, int_type)): Revert + 2005-01-05 change: actually, the previous behavior is conforming + and consistent with that of get(char_type*, streamsize, char_type), + albeit slightly different from that of 3.3/3.4 in a corner case + due to the use of snextc. + * include/bits/istream.tcc (ignore(streamsize), ignore(streamsize, + int_type)): Likewise. + * testsuite/27_io/basic_istream/ignore/char/4.cc: Remove. + * testsuite/27_io/basic_istream/ignore/wchar_t/4.cc: Likewise. + +2005-01-11 Paolo Carlini <pcarlini@suse.de> + * include/tr1/type_traits: Implement alignment_of and aligned_storage. * testsuite/tr1/4_metaprogramming/other_transformations/ aligned_storage/aligned_storage.cc: New. diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 876f626..1cb88ca 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -707,7 +707,7 @@ namespace std break; } - if (_M_gcount < __n) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; } catch(...) @@ -755,11 +755,9 @@ namespace std break; } - if (_M_gcount == __n) - ; - else if (traits_type::eq_int_type(__c, __eof)) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; - else + else if (traits_type::eq_int_type(__c, __delim)) { ++_M_gcount; __sb->sbumpc(); diff --git a/libstdc++-v3/src/istream.cc b/libstdc++-v3/src/istream.cc index dc99051..e3a3649 100644 --- a/libstdc++-v3/src/istream.cc +++ b/libstdc++-v3/src/istream.cc @@ -152,7 +152,7 @@ namespace std break; } - if (_M_gcount < __n) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; } catch(...) @@ -217,11 +217,9 @@ namespace std break; } - if (_M_gcount == __n) - ; - else if (traits_type::eq_int_type(__c, __eof)) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; - else + else if (traits_type::eq_int_type(__c, __delim)) { ++_M_gcount; __sb->sbumpc(); @@ -432,7 +430,7 @@ namespace std break; } - if (_M_gcount < __n) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; } catch(...) @@ -497,11 +495,9 @@ namespace std break; } - if (_M_gcount == __n) - ; - else if (traits_type::eq_int_type(__c, __eof)) + if (traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; - else + else if (traits_type::eq_int_type(__c, __delim)) { ++_M_gcount; __sb->sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/4.cc deleted file mode 100644 index 474f6a9..0000000 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/4.cc +++ /dev/null @@ -1,59 +0,0 @@ -// 2005-01-05 Paolo Carlini <pcarlini@suse.de> - -// Copyright (C) 2005 Free Software Foundation -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// 27.6.1.3 unformatted input functions - -#include <istream> -#include <sstream> -#include <testsuite_hooks.h> - -void -test01() -{ - using namespace std; - bool test __attribute__((unused)) = true; - - const string str_01("Gesang der junglinge"); - ios_base::iostate state1, state2; - - stringbuf isbuf_01(str_01, ios_base::in); - istream is_01(&isbuf_01); - - state1 = is_01.rdstate(); - VERIFY( state1 == ios_base::goodbit ); - - is_01.ignore(11, 'j'); - VERIFY( is_01.gcount() == 11 ); - state2 = is_01.rdstate(); - VERIFY( state2 == state1 ); - VERIFY( is_01.peek() == 'j' ); - - is_01.ignore(9); - VERIFY( is_01.gcount() == 9 ); - state2 = is_01.rdstate(); - VERIFY( state2 == state1 ); -} - -int -main() -{ - test01(); - return 0; -} diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/4.cc deleted file mode 100644 index 3618117..0000000 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/4.cc +++ /dev/null @@ -1,59 +0,0 @@ -// 2005-01-05 Paolo Carlini <pcarlini@suse.de> - -// Copyright (C) 2005 Free Software Foundation -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// 27.6.1.3 unformatted input functions - -#include <istream> -#include <sstream> -#include <testsuite_hooks.h> - -void -test01() -{ - using namespace std; - bool test __attribute__((unused)) = true; - - const wstring str_01(L"Gesang der junglinge"); - ios_base::iostate state1, state2; - - wstringbuf isbuf_01(str_01, ios_base::in); - wistream is_01(&isbuf_01); - - state1 = is_01.rdstate(); - VERIFY( state1 == ios_base::goodbit ); - - is_01.ignore(11, L'j'); - VERIFY( is_01.gcount() == 11 ); - state2 = is_01.rdstate(); - VERIFY( state2 == state1 ); - VERIFY( is_01.peek() == L'j' ); - - is_01.ignore(9); - VERIFY( is_01.gcount() == 9 ); - state2 = is_01.rdstate(); - VERIFY( state2 == state1 ); -} - -int -main() -{ - test01(); - return 0; -} |