From d8f5bd5016ed9acb54fe3680c7a0c82e3f6c5fc1 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Wed, 7 Jan 2004 17:13:51 +0000
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                        | 34 +++++++++++++++++++
 .../extractors_other/char/9318-in.cc          |  4 +--
 .../27_io/basic_ostream/endl/char/1.cc        |  1 -
 .../27_io/basic_ostream/ends/char/1.cc        |  4 +--
 .../27_io/basic_ostream/ends/char/2.cc        |  1 -
 .../27_io/basic_ostream/flush/char/1.cc       |  1 -
 .../inserters_character/char/1.cc             |  1 -
 .../inserters_character/char/2.cc             |  1 -
 .../inserters_character/char/3.cc             |  1 -
 .../inserters_character/char/4.cc             |  1 -
 .../inserters_character/char/5.cc             |  1 -
 .../inserters_character/char/6.cc             |  1 -
 .../inserters_character/char/8.cc             |  1 -
 .../inserters_character/wchar_t/7.cc          |  2 +-
 .../inserters_character/wchar_t/8.cc          |  1 -
 .../basic_ostream/inserters_other/char/2.cc   |  1 -
 .../basic_ostream/inserters_other/char/3.cc   |  2 --
 .../basic_ostream/inserters_other/char/4.cc   |  3 --
 18 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8a78a5a2067..4fa6859a460 100644
--- 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 f8110dbf0ee..1ca7c8ea74b 100644
--- 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 6c866ff83ba..762458512b1 100644
--- 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 3725fd8f00e..a6e8af845fc 100644
--- 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 fb5f8ccaaff..476526a46c5 100644
--- 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 2b05fd8f1f7..a59e2f7087d 100644
--- 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 976d45857ab..3625e99bc38 100644
--- 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 1fdbe376ae2..b718abfb79a 100644
--- 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 fedab18c053..0dfd009ab5c 100644
--- 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 e10380c8331..e04358067d3 100644
--- 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 a4e14534457..53701739887 100644
--- 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 72393d7356b..f3acc442cae 100644
--- 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 c4dc96cf19a..e434478a874 100644
--- 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 722ec06e8ae..bc15b5fd9ad 100644
--- 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 8b2c9d8c185..525c57632f0 100644
--- 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 c82e5cf508b..d14e2fc52c4 100644
--- 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 5f054fb8cd7..128f2434d24 100644
--- 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 949448e8372..110f6a1bf98 100644
--- 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