aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@gcc.gnu.org>2000-06-29 18:20:55 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2000-06-29 18:20:55 +0000
commitab30ba5c2396eb7cc4857e40eb10a72c2f9e2e42 (patch)
treed63bf5c62e51585d6a8552206b621795cbd17a8f /libstdc++-v3/testsuite
parent993c790ecd5b9e8950e98fa8e2cb992e0e3590e4 (diff)
downloadgcc-ab30ba5c2396eb7cc4857e40eb10a72c2f9e2e42.zip
gcc-ab30ba5c2396eb7cc4857e40eb10a72c2f9e2e42.tar.gz
gcc-ab30ba5c2396eb7cc4857e40eb10a72c2f9e2e42.tar.bz2
filebuf.cc: Tweak.
2000-06-28 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * testsuite/27_io/filebuf.cc: Tweak. * testsuite/27_io/filebuf_members.cc (test_01): Fix. * config/c_io_libio.cc (__basic_file::~__basic_file): Match libio filebuf dtor. (__basic_file::basic_file): Clean, add calls similar to _IO_file_attach. (__basic_file::open): Clean. (__basic_file::sys_open): Clean. * bits/std_fstream.h: Revert. * bits/fstream.tcc (filebuf::close()): Revert. (filebuf::basic_filebuf()): Revert. From-SVN: r34786
Diffstat (limited to 'libstdc++-v3/testsuite')
-rw-r--r--libstdc++-v3/testsuite/27_io/filebuf.cc4
-rw-r--r--libstdc++-v3/testsuite/27_io/filebuf_members.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/27_io/filebuf.cc b/libstdc++-v3/testsuite/27_io/filebuf.cc
index a04215e..ce51a59 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf.cc
@@ -46,6 +46,7 @@ derived_filebuf fb_03; // in | out
const int buffer_size = 8192;
+
// initialize filebufs to be the same size regardless of platform
void test00()
{
@@ -54,6 +55,7 @@ void test00()
fb_03.set_size(buffer_size);
}
+
// test the filebuf/stringbuf locale settings
bool test01() {
std::locale loc_tmp;
@@ -75,7 +77,7 @@ bool test02() {
test &= !fb_03.is_open();
// filebuf_type* open(const char* __s, ios_base::openmode __mode)
- fb_01.open(name_01, std::ios_base::in | std::ios_base::ate);
+ fb_01.open(name_01, std::ios_base::in | std::ios_base::ate);
fb_02.open(name_02, std::ios_base::in | std::ios_base::out | std::ios_base::trunc);
// Try to open two different files without closing the first:
// Should keep the old file attached, and disregard attempt to overthrow.
diff --git a/libstdc++-v3/testsuite/27_io/filebuf_members.cc b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
index 5057074..5933bfd 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf_members.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
@@ -60,7 +60,7 @@ test_01()
// read (standard)
FILE* f = fopen(name_01, "r");
- test &= !f;
+ test &= f != NULL;
{
std::ifstream ifstream1(name_01);