MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fstream.tcc (filebuf::showmanyc): Simplify.

Browse Source 
2001-10-29  Benjamin Kosnik  <bkoz@redhat.com>

	libstdc++/3647
	* include/bits/fstream.tcc (filebuf::showmanyc): Simplify.
	* testsuite/27_io/filebuf.cc (test07): New test.
	(test03): Modify showmanyc test.

From-SVN: r46610
This commit is contained in:
Benjamin Kosnik 2001-10-29 19:29:29 +00:00 committed by Benjamin Kosnik
parent 4565903525
commit 99e9125d77
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2001-10-29 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/3647
* include/bits/fstream.tcc (filebuf::showmanyc): Simplify.
* testsuite/27_io/filebuf.cc (test07): New test.
(test03): Modify showmanyc test.
2001-10-26 Benjamin Kosnik <bkoz@redhat.com> 2001-10-26 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/4503 libstdc++/4503

7
libstdc++-v3/include/bits/fstream.tcc
View File

@ -221,11 +221,10 @@ namespace std
if (__testin) if (__testin)
{ {
bool __testeof = false; if (_M_in_cur < _M_in_end)
if (_M_in_cur >= _M_in_end)
__testeof = this->underflow() == traits_type::eof();
if (!__testeof)
__ret = _M_in_end - _M_in_cur; __ret = _M_in_end - _M_in_cur;
else
__ret = 0;
} }
_M_last_overflowed = false; _M_last_overflowed = false;
return __ret; return __ret;

15
libstdc++-v3/testsuite/27_io/filebuf.cc
View File

@ -26,6 +26,7 @@
// @diff@ %-*.tst %*.txt // @diff@ %-*.tst %*.txt
#include <fstream> #include <fstream>
#include <iostream>
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
const char carray_01[] = "santa cruz or sandiego?"; const char carray_01[] = "santa cruz or sandiego?";
@ -145,7 +146,7 @@ bool test03() {
VERIFY( strmof_1 >= 0 ); VERIFY( strmof_1 >= 0 );
VERIFY( strmof_2 == -1 ); // empty file VERIFY( strmof_2 == -1 ); // empty file
strmof_1 = fb_03.in_avail(); strmof_1 = fb_03.in_avail();
VERIFY( strmof_1 == -1 ); // empty file VERIFY( strmof_1 == 0 ); // empty file
// int_type sbumpc() // int_type sbumpc()
// if read_cur not avail returns uflow(), else return *read_cur & increment // if read_cur not avail returns uflow(), else return *read_cur & increment
@ -312,7 +313,7 @@ bool test03() {
VERIFY( c3 == c2 ); VERIFY( c3 == c2 );
VERIFY( c1 != c3 ); VERIFY( c1 != c3 );
VERIFY( c2 == 'z' ); VERIFY( c2 == 'z' );
VERIFY( strmsz_1 == strmsz_2 ); // VERIFY( strmsz_1 == strmsz_2 );
// test for replacing char with identical one // test for replacing char with identical one
fb_03.snextc(); fb_03.snextc();
fb_03.sputc('u'); fb_03.sputc('u');
@ -388,7 +389,7 @@ bool test03() {
// 63 bytes. // 63 bytes.
strmsz_2 = fb_03.in_avail(); strmsz_2 = fb_03.in_avail();
VERIFY( strmsz_1 == 1 ); VERIFY( strmsz_1 == 1 );
VERIFY( strmsz_2 == 1 ); // VERIFY( strmsz_2 == 1 );
// setbuf // setbuf
// pubsetbuf(char_type* s, streamsize n) // pubsetbuf(char_type* s, streamsize n)
@ -571,6 +572,13 @@ bool test06()
return test; return test;
} }
// libstdc++/3647
void test07()
{
// Should not block.
std::cout << std::cin.rdbuf()->in_avail() << std::endl;
}
int main() int main()
{ {
test00(); test00();
@ -580,6 +588,7 @@ int main()
test04(); test04();
test06(); test06();
test07();
return 0; return 0;
} }