This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Remove a few more #include...
- From: Paolo Carlini <pcarlini at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 07 Jan 2004 18:17:37 +0100
- Subject: [v3] Remove a few more #include...
Hi,
probably the last one, for now...
Tested x86-linux.
Paolo.
/////////////
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.
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/9318-in.cc 2004-01-07 17:32:34.000000000 +0100
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/endl/char/1.cc libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/endl/char/1.cc 2003-09-23 22:03:13.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/endl/char/1.cc 2004-01-07 17:40:44.000000000 +0100
@@ -22,7 +22,6 @@
#include <ostream>
#include <sstream>
-#include <stdexcept>
#include <testsuite_hooks.h>
void test01(void)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/ends/char/1.cc libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/ends/char/1.cc 2003-09-23 22:03:13.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/1.cc 2004-01-07 17:36:26.000000000 +0100
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/ends/char/2.cc libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/ends/char/2.cc 2003-09-23 22:03:13.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/ends/char/2.cc 2004-01-07 17:36:50.000000000 +0100
@@ -22,7 +22,6 @@
#include <ostream>
#include <sstream>
-#include <stdexcept>
#include <testsuite_hooks.h>
// based vaguely on this:
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/flush/char/1.cc libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/flush/char/1.cc 2003-09-23 22:03:13.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/flush/char/1.cc 2004-01-07 17:41:43.000000000 +0100
@@ -22,7 +22,6 @@
#include <ostream>
#include <sstream>
-#include <stdexcept>
#include <testsuite_hooks.h>
void test01(void)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/1.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/1.cc 2003-04-10 09:15:34.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/1.cc 2004-01-07 17:43:14.000000000 +0100
@@ -22,7 +22,6 @@
#include <string>
#include <ostream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/2.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/2.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/2.cc 2004-01-07 17:43:42.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// ostringstream width() != zero
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/3.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/3.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/3.cc 2004-01-07 17:43:59.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// width() != zero
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/4.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/4.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/4.cc 2004-01-07 17:44:21.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// stringstream and large strings
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/5.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/5.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/5.cc 2004-01-07 17:44:47.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// ostringstream and large strings number 2
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/6.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/6.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/6.cc 2004-01-07 17:45:20.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// ostringstream and positioning, multiple writes
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/8.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/char/8.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/8.cc 2004-01-07 17:45:49.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void test08()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/7.cc 2004-01-07 17:46:54.000000000 +0100
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc 2003-09-23 22:03:14.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/8.cc 2004-01-07 17:47:33.000000000 +0100
@@ -23,7 +23,6 @@
#include <string>
#include <ostream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void test08()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/2.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/2.cc 2003-04-10 09:15:34.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/2.cc 2004-01-07 17:49:33.000000000 +0100
@@ -24,7 +24,6 @@
// @diff@ %-*.tst %-*.txt
#include <ostream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/3.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/3.cc 2003-09-23 22:03:15.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/3.cc 2004-01-07 17:50:08.000000000 +0100
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/4.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_other/char/4.cc 2003-09-23 22:03:15.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/4.cc 2004-01-07 17:50:56.000000000 +0100
@@ -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