Commit 158227a6 by Benjamin Kosnik Committed by Benjamin Kosnik

istream_unformatted.cc (test05): Fixup.


2000-11-26  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/27_io/istream_unformatted.cc (test05): Fixup.

From-SVN: r37769
parent 44382959
2000-11-26 Benjamin Kosnik <bkoz@redhat.com> 2000-11-26 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/27_io/istream_unformatted.cc (test05): Fixup.
2000-11-26 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4: Only sanity check for compiler version when * acinclude.m4: Only sanity check for compiler version when
configuring. More fixes for 'make clean'. configuring. More fixes for 'make clean'.
* aclocal.m4: Regenerate. * aclocal.m4: Regenerate.
......
...@@ -379,7 +379,7 @@ aaaaaaaaaaaaaa ...@@ -379,7 +379,7 @@ aaaaaaaaaaaaaa
std::stringbuf sb(charray, std::ios_base::in); std::stringbuf sb(charray, std::ios_base::in);
std::istream ifs(&sb); std::istream ifs(&sb);
std::streamsize blen = std::strlen(charray); std::streamsize blen = std::strlen(charray);
VERIFY(ifs); VERIFY(!(!ifs));
while(ifs.getline(tmp, it) || ifs.gcount()) while(ifs.getline(tmp, it) || ifs.gcount())
{ {
br += ifs.gcount(); br += ifs.gcount();
...@@ -403,7 +403,7 @@ aaaaaaaaaaaaaa ...@@ -403,7 +403,7 @@ aaaaaaaaaaaaaa
// -> n - 1 characters are stored // -> n - 1 characters are stored
ifs.clear(ifs.rdstate() & ~std::ios::failbit); ifs.clear(ifs.rdstate() & ~std::ios::failbit);
VERIFY((ifs.gcount() == 0) || (std::strlen(tmp) == it - 1)); VERIFY((ifs.gcount() == 0) || (std::strlen(tmp) == it - 1));
VERIFY(ifs); VERIFY(!(!ifs));
continue; continue;
} }
else else
...@@ -458,10 +458,11 @@ test06() ...@@ -458,10 +458,11 @@ test06()
int int
test07() test07()
{ {
bool test = true;
const char* tfn = "testsuite/istream_unformatted-3.txt"; const char* tfn = "testsuite/istream_unformatted-3.txt";
std::ifstream infile; std::ifstream infile;
infile.open(tfn); infile.open(tfn);
VERIFY( infile ); VERIFY( !(!infile) );
while (infile) while (infile)
{ {
std::string line; std::string line;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment