From b80115c4b75caf5920a59aa9e08909a2e0181901 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 6 Jan 2004 12:20:42 +0000 Subject: [PATCH] 1.cc: Remove redundant #includes. 2004-01-06 Paolo Carlini * 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. From-SVN: r75469 --- libstdc++-v3/ChangeLog | 36 +++++++++++++++++++ .../basic_istream/extractors_other/char/1.cc | 3 -- .../basic_istream/extractors_other/char/2.cc | 1 - .../basic_istream/extractors_other/char/3.cc | 3 -- .../27_io/basic_istream/get/char/1.cc | 4 --- .../27_io/basic_istream/get/char/2.cc | 1 - .../27_io/basic_istream/getline/char/1.cc | 4 --- .../27_io/basic_istream/getline/char/2.cc | 5 +-- .../27_io/basic_istream/getline/char/3.cc | 5 +-- .../27_io/basic_istream/ignore/char/1.cc | 4 --- .../27_io/basic_istream/ignore/char/6360.cc | 4 --- .../27_io/basic_istream/ignore/char/7220.cc | 4 --- .../27_io/basic_istream/peek/char/1.cc | 4 --- .../27_io/basic_istream/peek/char/6414.cc | 1 - .../27_io/basic_istream/putback/char/1.cc | 3 -- .../27_io/basic_istream/read/char/1.cc | 3 -- .../27_io/basic_istream/read/char/2.cc | 4 --- .../27_io/basic_istream/read/char/3.cc | 4 --- .../basic_istream/readsome/char/6746-1.cc | 4 --- .../basic_istream/readsome/char/6746-2.cc | 2 -- .../27_io/basic_istream/readsome/char/8258.cc | 6 +--- .../basic_istream/seekg/char/2346-fstream.cc | 1 - .../basic_istream/seekg/char/2346-sstream.cc | 3 -- .../27_io/basic_istream/seekg/char/8348-1.cc | 3 -- .../27_io/basic_istream/seekg/char/8348-2.cc | 3 -- .../27_io/basic_istream/tellg/char/8348.cc | 3 -- 26 files changed, 39 insertions(+), 79 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 22eeb34ae85..34829add88c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,39 @@ +2004-01-06 Paolo Carlini + + * 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. + 2004-01-04 Paolo Carlini * testsuite/27_io/basic_istream/extractors_arithmetic/char/01.cc: diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc index 01426e75259..a8a81e27fa6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/1.cc @@ -19,12 +19,9 @@ // USA. // 27.6.1.2.3 basic_istream::operator>> -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include #include -#include #include // stringbufs. diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc index 2fd1cd03bc4..f99fd7b0805 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/2.cc @@ -23,7 +23,6 @@ // @diff@ %-*.tst %-*.txt #include -#include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc index 1e195323197..d0c60e78996 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/3.cc @@ -19,12 +19,9 @@ // USA. // 27.6.1.2.3 basic_istream::operator>> -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include #include -#include #include void test03() diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc index 4cc8f35952b..269cd7c9f0f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/1.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include void diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc index 8317e1aee81..ce6302f82ce 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/get/char/2.cc @@ -22,7 +22,6 @@ // @require@ %-*.tst %-*.txt // @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc index ccde173c62b..eef9573625b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/1.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include void diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc index 543d7cbba47..3810544b30d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/2.cc @@ -19,13 +19,10 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... +#include // for strlen #include #include -#include #include // [patch] bits/istream.tcc - getline(char_type*,streamsize,char_type) diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc index 0d640de02b8..3cd1f81cd0d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/char/3.cc @@ -19,13 +19,10 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... +#include // for strlen #include #include -#include #include // [bug] istream::getline(char*,streamsize) still broken diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc index c0a753e26d7..8dfe1d68105 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/1.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include void diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc index 38c40cea24b..3873007a82d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/6360.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include // 2002-04-19 PR libstdc++ 6360 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc index 6e0c9151e69..f7ae355f855 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/7220.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include // libstdc++/70220 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc index be4b0700d10..957c2ef4ccf 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/1.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include void diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc index e060ff2716d..98a99e78e75 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/peek/char/6414.cc @@ -24,7 +24,6 @@ // @diff@ %-*.tst %-*.txt #include -#include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc index 47fcd0136f2..870d57aa355 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/putback/char/1.cc @@ -19,10 +19,7 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc index 0ece0a5d596..70f14b9ef24 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/1.cc @@ -19,13 +19,10 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt #include // for strncmp,... #include #include -#include #include void diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc index 6779c2b7d32..7eeb212146e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/2.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include // Jim Parsons diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc index b66f730ed01..e5891c80815 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/read/char/3.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include // Theodore Papadopoulo diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc index 6a42fd32cfb..6a2aef3c9c5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-1.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include #include -#include #include // libstdc++/6746 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc index 95b421306a0..b728d863164 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc @@ -26,9 +26,7 @@ // @require@ %-*.tst %-*.txt // @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include -#include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc index 67596719dc3..4b155b651a0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/8258.cc @@ -19,13 +19,9 @@ // USA. // 27.6.1.3 unformatted input functions -// @require@ %-*.tst %-*.txt -// @diff@ %-*.tst %-*.txt -#include // for strncmp,... #include -#include -#include +#include #include // libstdc++/8258 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc index af2b81668b5..72686f1b699 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-fstream.cc @@ -24,7 +24,6 @@ // @diff@ %-*.tst %-*.txt #include -#include #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc index 6a8f5d72c0d..60e43c9a78b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/2346-sstream.cc @@ -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 #include -#include #include const char* s = " lootpack, peanut butter wolf, rob swift, madlib, quasimoto"; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc index 273855a0b64..b850215eaec 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-1.cc @@ -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 #include -#include #include // libstdc++/8348 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc index 233773193ee..204dddeb332 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/8348-2.cc @@ -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 #include -#include #include // libstdc++/8348 diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc index 2cb9ea7fe93..3b0226918b7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/8348.cc @@ -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 #include -#include #include // libstdc++/8348