This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Remove more redundant #includes
- From: Paolo Carlini <pcarlini at suse dot de>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 06 Jan 2004 13:25:28 +0100
- Subject: [v3] Remove more redundant #includes
Hi,
another trivial, but long overdue, clean up.
Tested x86-linux.
Paolo.
///////////
2004-01-06 Paolo Carlini <pcarlini@suse.de>
* testsuite/27_io/basic_istream/extractors_other/char/1.cc:
Remove redundant #includes.
* testsuite/27_io/basic_istream/extractors_other/char/2.cc:
Likewise.
* testsuite/27_io/basic_istream/extractors_other/char/3.cc:
Likewise.
* testsuite/27_io/basic_istream/get/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/get/char/2.cc: Likewise.
* testsuite/27_io/basic_istream/getline/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/getline/char/2.cc: Likewise.
* testsuite/27_io/basic_istream/getline/char/3.cc: Likewise.
* testsuite/27_io/basic_istream/ignore/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/ignore/char/6360.cc: Likewise.
* testsuite/27_io/basic_istream/ignore/char/7220.cc: Likewise.
* testsuite/27_io/basic_istream/peek/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/peek/char/6414.cc: Likewise.
* testsuite/27_io/basic_istream/putback/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/read/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/read/char/2.cc: Likewise.
* testsuite/27_io/basic_istream/read/char/3.cc: Likewise.
* testsuite/27_io/basic_istream/readsome/char/6746-1.cc:
Likewise.
* testsuite/27_io/basic_istream/readsome/char/6746-2.cc:
Likewise.
* testsuite/27_io/basic_istream/readsome/char/8258.cc:
Likewise.
* testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc:
Likewise.
* testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc:
Likewise.
* testsuite/27_io/basic_istream/seekg/char/8348-1.cc: Likewise.
* testsuite/27_io/basic_istream/seekg/char/8348-2.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/char/8348.cc: Likewise.
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/1.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc 2004-01-06 12:51:46.000000000 +0100
@@ -19,12 +19,9 @@
// USA.
// 27.6.1.2.3 basic_istream::operator>>
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// stringbufs.
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/2.cc libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/2.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc 2004-01-06 12:52:10.000000000 +0100
@@ -23,7 +23,6 @@
// @diff@ %-*.tst %-*.txt
#include <istream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/3.cc libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/extractors_other/char/3.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc 2004-01-06 12:52:34.000000000 +0100
@@ -19,12 +19,9 @@
// USA.
// 27.6.1.2.3 basic_istream::operator>>
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void test03()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/get/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/get/char/1.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc 2004-01-06 12:05:46.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/get/char/2.cc libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/get/char/2.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc 2004-01-06 11:56:07.000000000 +0100
@@ -22,7 +22,6 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
#include <fstream>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/1.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc 2004-01-06 12:03:17.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/2.cc libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/2.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc 2004-01-06 12:04:11.000000000 +0100
@@ -19,13 +19,10 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
+#include <cstring> // for strlen
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// [patch] bits/istream.tcc - getline(char_type*,streamsize,char_type)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/3.cc libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/getline/char/3.cc 2003-09-23 22:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc 2004-01-06 12:05:14.000000000 +0100
@@ -19,13 +19,10 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
+#include <cstring> // for strlen
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// [bug] istream::getline(char*,streamsize) still broken
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/1.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc 2004-01-06 12:02:06.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/6360.cc libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/6360.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc 2004-01-06 12:02:22.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// 2002-04-19 PR libstdc++ 6360
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/7220.cc libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/ignore/char/7220.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc 2004-01-06 12:02:38.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/70220
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/peek/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/peek/char/1.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc 2004-01-06 12:06:24.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/peek/char/6414.cc libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/peek/char/6414.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc 2004-01-06 12:01:01.000000000 +0100
@@ -24,7 +24,6 @@
// @diff@ %-*.tst %-*.txt
#include <istream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/putback/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/putback/char/1.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc 2004-01-06 12:07:31.000000000 +0100
@@ -19,10 +19,7 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/1.cc libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/1.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc 2004-01-06 12:08:07.000000000 +0100
@@ -19,13 +19,10 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
void
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/2.cc libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/2.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc 2004-01-06 12:08:47.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// Jim Parsons <parsons at clearway dot com>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/3.cc libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/read/char/3.cc 2003-09-23 22:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc 2004-01-06 12:09:20.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// Theodore Papadopoulo
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/6746-1.cc libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/6746-1.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc 2004-01-06 12:10:05.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/6746
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/6746-2.cc libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/6746-2.cc 2003-12-29 20:26:15.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc 2004-01-06 12:10:37.000000000 +0100
@@ -26,9 +26,7 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/8258.cc libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/readsome/char/8258.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc 2004-01-06 12:11:48.000000000 +0100
@@ -19,13 +19,9 @@
// USA.
// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
-#include <cstring> // for strncmp,...
#include <istream>
-#include <sstream>
-#include <fstream>
+#include <streambuf>
#include <testsuite_hooks.h>
// libstdc++/8258
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc 2004-01-06 12:12:59.000000000 +0100
@@ -24,7 +24,6 @@
// @diff@ %-*.tst %-*.txt
#include <istream>
-#include <sstream>
#include <fstream>
#include <testsuite_hooks.h>
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc 2004-01-06 12:46:49.000000000 +0100
@@ -20,12 +20,9 @@
// 27.6.1.3 unformatted input functions
// NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
const char* s = " lootpack, peanut butter wolf, rob swift, madlib, quasimoto";
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/8348-1.cc libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/8348-1.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc 2004-01-06 12:47:16.000000000 +0100
@@ -20,12 +20,9 @@
// 27.6.1.3 unformatted input functions
// NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/8348
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/8348-2.cc libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/seekg/char/8348-2.cc 2003-09-23 22:03:09.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc 2004-01-06 12:47:40.000000000 +0100
@@ -20,12 +20,9 @@
// 27.6.1.3 unformatted input functions
// NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/8348
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/tellg/char/8348.cc libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/tellg/char/8348.cc 2003-09-23 22:03:10.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc 2004-01-06 12:48:54.000000000 +0100
@@ -20,12 +20,9 @@
// 27.6.1.3 unformatted input functions
// NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
#include <istream>
#include <sstream>
-#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/8348