9318-in.cc: Remove redundant #include.

2004-01-07  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc:
	Remove redundant #include.
	* testsuite/27_io/basic_ostream/endl/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise,
	re-enable normal testing.
	* testsuite/27_io/basic_ostream/ends/char/2.cc: Remove redundant
	#include.
	* testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/1.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/2.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/3.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/4.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/5.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/6.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/char/8.cc:
	Likewise.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc:
	More properly, #include <locale>.
	* testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc:
	Remove redundant #include.
	* testsuite/27_io/basic_ostream/inserters_other/char/2.cc: Likewise.
	* testsuite/27_io/basic_ostream/inserters_other/char/3.cc: Remove
	redundant DejaGnu directive.
	* testsuite/27_io/basic_ostream/inserters_other/char/4.cc: Remove
	redundant #include.

From-SVN: r75508

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8a78a5a20674be703e53c8b7fb3a1a3321f95054..4fa6859a46001fb423d23fdbc6bf9ca8dcea96ff 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,37 @@
+2004-01-07  Paolo Carlini  <pcarlini@suse.de>
+
+       * testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc:
+       Remove redundant #include.
+       * testsuite/27_io/basic_ostream/endl/char/1.cc: Likewise.
+       * testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise,
+       re-enable normal testing.
+       * testsuite/27_io/basic_ostream/ends/char/2.cc: Remove redundant
+       #include.
+       * testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/1.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/2.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/3.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/4.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/5.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/6.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/char/8.cc:
+       Likewise.
+       * testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc:
+       More properly, #include <locale>.
+       * testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc:
+       Remove redundant #include.
+       * testsuite/27_io/basic_ostream/inserters_other/char/2.cc: Likewise.
+       * testsuite/27_io/basic_ostream/inserters_other/char/3.cc: Remove
+       redundant DejaGnu directive.
+       * testsuite/27_io/basic_ostream/inserters_other/char/4.cc: Remove
+       redundant #include.
+
 2004-01-06  Benjamin Kosnik  <bkoz@redhat.com>
             Stefan Olsson  <stefan@snon.net>
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
index f8110dbf0eef64d4b3762fa3d110a6ebe0fd91cc..1ca7c8ea74b7a437be8e74bb5b183a84f8f20fb1 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
@@ -29,10 +29,8 @@
 
 // 27.5.2 template class basic_streambuf
 
-#include <cstring> // for memset, memcmp
-#include <streambuf>
 #include <sstream>
-#include <ostream>
+#include <istream>
 #include <testsuite_hooks.h>
 
 // libstdc++/9318

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
index 6c866ff83bae2415a3f8c6b990746bb48a333de4..762458512b1bcee56f74f4e3806f6dc14ac45254 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
@@ -22,7 +22,6 @@
 
 #include <ostream>
 #include <sstream>
-#include <stdexcept>
 #include <testsuite_hooks.h>
 
 void test01(void)

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
index 3725fd8f00ed33aaf0a57bf24d3b45d1afd707e4..a6e8af845fcf42359398c3acb4ded8b4b6512f59 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
@@ -22,9 +22,7 @@
 
 #include <ostream>
 #include <sstream>
-#include <stdexcept>
-//#include <testsuite_hooks.h>
-#define VERIFY(x) test&=x
+#include <testsuite_hooks.h>
 
 void test01(void)
 {

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
index fb5f8ccaaff97b61f04a60d98a2aa4154b19a639..476526a46c5d25c41a937e2cd1d542aa3cabf965 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
@@ -22,7 +22,6 @@
 
 #include <ostream>
 #include <sstream>
-#include <stdexcept>
 #include <testsuite_hooks.h>
 
 // based vaguely on this:

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
index 2b05fd8f1f798d34ca4eb0c09d48ae653bcecfd3..a59e2f7087dbe83ad13f9098ac23c32bc024fff9 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
@@ -22,7 +22,6 @@
 
 #include <ostream>
 #include <sstream>
-#include <stdexcept>
 #include <testsuite_hooks.h>
 
 void test01(void)

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc
index 976d45857ab851c83718de0875c797ca30f1d25c..3625e99bc3877bfd8e0f22eb21ad37059e293b09 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc
@@ -22,7 +22,6 @@
 
 #include <string>
 #include <ostream>
-#include <sstream>
 #include <fstream>
 #include <testsuite_hooks.h>
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
index 1fdbe376ae2be601e7f59b72b69e27645fdeb214..b718abfb79a0f65d3456962771a5c67f1622dc2c 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 // ostringstream width() != zero

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
index fedab18c0533350a40268400558d8a46eca48e2d..0dfd009ab5c41d592873f013f7312dde3942629e 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 // width() != zero

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
index e10380c8331ad237c38b4b5e48bdeb754928b948..e04358067d3d54be39da7ecd64c2c570c86b33e0 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 // stringstream and large strings

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
index a4e14534457e2b5735ab3f25aa798c34ce587f66..5370173988769d912b86a92652e396117f7a3f2b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 // ostringstream and large strings number 2

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
index 72393d7356b1bc429a909ec4e1aced8163c51217..f3acc442caea3a4141842e976c5e04f5f3bc9adf 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 // ostringstream and positioning, multiple writes

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
index c4dc96cf19abb0e9503c42f4f926b2fcfb5c5312..e434478a874adfe02b16335feb3b6e5abd0f187a 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 void test08()

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
index 722ec06e8ae65acbd4fe3e858fc70c05312e7299..bc15b5fd9ad768b0e0dde547876ba353d60af36b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
@@ -23,7 +23,7 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
+#include <locale>
 #include <testsuite_hooks.h>
 
 // Global counter, needs to be reset after use.

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
index 8b2c9d8c185846db69e0ba5900d4ca36e857846f..525c57632f012076cf8600722dfff8c620cd530b 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
@@ -23,7 +23,6 @@
 #include <string>
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 void test08()

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc
index c82e5cf508b28cd078121722857a90440ed3dcae..d14e2fc52c42e88abeadbd4e58fb6036ec283a7a 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc
@@ -24,7 +24,6 @@
 // @diff@ %-*.tst %-*.txt
 
 #include <ostream>
-#include <sstream>
 #include <fstream>
 #include <testsuite_hooks.h>
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
index 5f054fb8cd75ff4a6a0b93328f2a96105a9f6d12..128f2434d248b67996e643c315d54b11b8f7aeee 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
@@ -20,8 +20,6 @@
 // USA.
 
 // 27.6.2.5.4 basic_ostream character inserters
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 #include <ostream>
 #include <sstream>

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
index 949448e83722f253981f7cf93d8482a90913a868..110f6a1bf98172e8a0b1bd914a691944a64f5756 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
@@ -20,12 +20,9 @@
 // USA.
 
 // 27.6.2.5.4 basic_ostream character inserters
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 #include <ostream>
 #include <sstream>
-#include <fstream>
 #include <testsuite_hooks.h>
 
 class test_buffer_1 : public std::streambuf