diff options
Diffstat (limited to 'libstdc++-v3')
5 files changed, 23 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b2907b3..21c54b5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,16 @@ 2003-06-29 Paolo Carlini <pcarlini@unitus.it> + * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: + Improve type correctness-wise. + * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: + Likewise. + * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: + Likewise. + * testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: + Likewise. + +2003-06-29 Paolo Carlini <pcarlini@unitus.it> + * include/std/std_streambuf.h (uflow): According to 27.5.2.4.3,p16, don't check gptr() < egptr(). diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc index 5174c33..185fb1e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc @@ -32,10 +32,10 @@ void test01() fb.pubimbue(loc); fb.pubsetbuf(0, 0); fb.open("tmp_11305-1", ios_base::out); - wint_t n1 = fb.sputc(0x20000000); + wfilebuf::int_type n1 = fb.sputc(L'e'); wfilebuf* f = fb.close(); - VERIFY( n1 != WEOF ); + VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( f != NULL ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc index 571d717..f50f592 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc @@ -32,12 +32,12 @@ void test02() fb.pubimbue(loc); fb.pubsetbuf(0, 0); fb.open("tmp_11305-2", ios_base::out); - wint_t n1 = fb.sputc(0x20000000); - wint_t n2 = fb.sputc(0x40000000); + wfilebuf::int_type n1 = fb.sputc(L'n'); + wfilebuf::int_type n2 = fb.sputc(L'e'); wfilebuf* f = fb.close(); - VERIFY( n1 != WEOF ); - VERIFY( n2 != WEOF ); + VERIFY( n1 != wfilebuf::traits_type::eof() ); + VERIFY( n2 != wfilebuf::traits_type::eof() ); VERIFY( f != NULL ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc index 86c81fa..86153ea1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc @@ -31,10 +31,10 @@ void test03() locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.open("tmp_11305-3", ios_base::out); - wint_t n1 = fb.sputc(0x20000000); + wfilebuf::int_type n1 = fb.sputc(L'a'); wfilebuf* f = fb.close(); - VERIFY( n1 != WEOF ); + VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( f != NULL ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc index 100e6a2..b923a8a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc @@ -31,12 +31,12 @@ void test04() locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.open("tmp_11405-4", ios_base::out); - wint_t n1 = fb.sputc(0x20000000); - wint_t n2 = fb.sputc(0x40000000); + wfilebuf::int_type n1 = fb.sputc(L'i'); + wfilebuf::int_type n2 = fb.sputc(L'a'); wfilebuf* f = fb.close(); - VERIFY( n1 != WEOF ); - VERIFY( n2 != WEOF ); + VERIFY( n1 != wfilebuf::traits_type::eof() ); + VERIFY( n2 != wfilebuf::traits_type::eof() ); VERIFY( f != NULL ); } |