From: Paolo Carlini <pcarlini@unitus.it>
Date: Sun, 29 Jun 2003 11:12:35 +0000 (+0200)
Subject: 11305-1.cc: Improve type correctness-wise.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=165f54e074b91a80005c7e776f1cceae089b9655;p=gcc.git

11305-1.cc: Improve type correctness-wise.

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.

From-SVN: r68666
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b2907b383d7..21c54b56c00 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+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
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 5174c332d8a..185fb1ed658 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 571d7178bce..f50f59218cd 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 86c81fa5604..86153ea1ff0 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 100e6a2b0f4..b923a8a9e70 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 );
 }