mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-20 19:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

streambuf.tcc (__copy_streambufs): Don't set eofbit.

Browse Source 
2001-06-26  Benjamin Kosnik  <bkoz@fillmore.constant.com>
	                     <vakatov@ncbi.nlm.nih.gov>

	libstdc++/3272
	* include/bits/streambuf.tcc (__copy_streambufs): Don't set eofbit.
	* testsuite/27_io/ostream_inserter_other.cc (test04): Add test.
	* testsuite/27_io/istream_extractor_other.cc: Fix.

From-SVN: r43602
This commit is contained in:
Benjamin Kosnik 2001-06-27 01:07:29 +00:00 committed by Benjamin Kosnik
parent e979f9e88c
commit f2f5472f06
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2001-06-26 Benjamin Kosnik <bkoz@fillmore.constant.com>
<vakatov@ncbi.nlm.nih.gov>
libstdc++/3272
* include/bits/streambuf.tcc (__copy_streambufs): Don't set eofbit.
* testsuite/27_io/ostream_inserter_other.cc (test04): Add test.
* testsuite/27_io/istream_extractor_other.cc: Fix.
2001-06-26 Zoltan Hidvegi <hzoli@austin.ibm.com>
* acinclude.m4 (glibcpp_toolexeclibdir): Make multilib safe.

8
libstdc++-v3/include/bits/streambuf.tcc
View File

@ -206,12 +206,8 @@ namespace std {
__sbin->_M_in_cur_move(__xtrct);
if (__xtrct == __bufsize)
{
int_type __c = __sbin->sgetc();
if (__c == _Traits::eof())
{
__ios.setstate(ios_base::eofbit);
break;
}
if (__sbin->sgetc() == _Traits::eof())
break;
__bufsize = __sbin->in_avail();
}
else

4
libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
View File

@ -128,9 +128,9 @@ bool test01() {
state1 = is_04.rdstate();
is_04 >> &isbuf_03;
state2 = is_04.rdstate();
VERIFY( state1 != state2 );
VERIFY( state1 == state2 );
VERIFY( !static_cast<bool>(state2 & statefail) );
VERIFY( state2 == stateeof );
VERIFY( state2 != stateeof );
strtmp = isbuf_03.str();
VERIFY( strtmp == str_02 ); // as only an "in" buffer
VERIFY( isbuf_03.sgetc() == 'a' );

17
libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
View File

@ -1,7 +1,7 @@
// 1999-08-16 bkoz
// 1999-11-01 bkoz
// Copyright (C) 1999, 2000 Free Software Foundation
// Copyright (C) 1999, 2000, 2001 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
@ -134,6 +134,21 @@ test03(void)
return 0;
}
// libstdc++/3272
void test04()
{
using namespace std;
bool test = true;
istringstream istr("inside betty carter");
ostringstream ostr;
ostr << istr.rdbuf() << endl;
if (ostr.rdstate() & ios_base::eofbit)
test = false;
VERIFY( test );
}
int
main()
{