diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 22eeb34ae851c9bd0ea774e51915739c4ddcab29..34829add88c52e7a383cc0b731a7847161a129d6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,39 @@ +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. + 2004-01-04 Paolo Carlini <pcarlini@suse.de> * 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 01426e75259ad2e933f4196a582b2433953ece76..a8a81e27fa62dc76870b28c3f1be53fb1dbb27f5 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 2fd1cd03bc4e7aa18b69b46afdd4a05f9c23bb81..f99fd7b0805ecde83d6520f659a9bd7865907c0a 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 <istream> -#include <sstream> #include <fstream> #include <testsuite_hooks.h> 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 1e1953231971002f1f8797659eb29f51442f1df2..d0c60e78996b82232a27077403e8b26b5e763043 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 4cc8f35952b72fcd6a5fedaab892b614df61d3f6..269cd7c9f0fd27e32e8b3a21a1624fd914c49257 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 8317e1aee81f13429dbc68112f88d342e5772314..ce6302f82ceae88e6c8fd8f113b2d05f1af7aaad 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 <cstring> // for strncmp,... #include <istream> #include <sstream> #include <fstream> 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 ccde173c62be8071aaf2ffd2f0385ef11d90b0cd..eef9573625b01882d9d625a97fa0955119fb09ae 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 543d7cbba47c660a99ef6c6e94538a175bf773eb..3810544b30d0ce4d562958025ca52296ff4b51cf 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 <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 --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 0d640de02b8fedc9b721a393c6c81c89d05eb98c..3cd1f81cd0dd7a01e9f2b31cd91cfc5bc82a516f 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 <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 --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 c0a753e26d779107a6a66aaf73b16096cd7929c0..8dfe1d68105c46a64c8eafc86580ace431e96b66 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 38c40cea24bacf0da364f505f17cbd3b3038e584..3873007a82d8677213461b31e9ee17710d117e9d 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 6e0c9151e69370d4c803b84e4b0fa8ac9bff4bf4..f7ae355f855246ceaf23e3f8799a9f3cf9721d57 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 be4b0700d102906123921559a96cf3e4f4697f6b..957c2ef4ccfc8b0291ab4c85c06754567e132d59 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 e060ff2716defae3e3f16a26fd092d030ad96322..98a99e78e7507ce24c51deee54926b6fcae84e59 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 <istream> -#include <sstream> #include <fstream> #include <testsuite_hooks.h> 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 47fcd0136f2337c0c38f4c3b2f8de2fdaa8ea580..870d57aa3557e1c0c3c9dfb19daad22b03012fd3 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 <cstring> // for strncmp,... #include <istream> #include <sstream> #include <testsuite_hooks.h> 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 0ece0a5d596e82e6301581a15ae2de1650f3658a..70f14b9ef24181b0a1ce85e6309a5c909b40166b 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 6779c2b7d324a87a8ce5ee41497ec6c5c6867858..7eeb212146e1f9532dff51b48f3ccfb542bedad4 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // Jim Parsons <parsons at clearway dot com> 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 b66f730ed01137a58d7562f77bef4ebc9fef1029..e5891c80815d9cfb23d9be2c505581212447612f 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 6a42fd32cfb0789e9cc71a1d623f47c126760863..6a2aef3c9c529b33d71eab3a41be369ed7ce5268 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 <cstring> // for strncmp,... #include <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 95b421306a05a7c7d3049679e15ac0ae815d29f3..b728d863164a3cf42bcd3b9d81cf931d704d0ae8 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 <cstring> // for strncmp,... #include <istream> -#include <sstream> #include <fstream> #include <testsuite_hooks.h> 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 67596719dc3545abf9fe5d3022b846f69d8368d1..4b155b651a05099224029896a06cb05b0498274d 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 <cstring> // for strncmp,... #include <istream> -#include <sstream> -#include <fstream> +#include <streambuf> #include <testsuite_hooks.h> // 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 af2b81668b5e0fdac7515707bf362453d021f5c4..72686f1b699bc169d1b967a899a13b103eaf8661 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 <istream> -#include <sstream> #include <fstream> #include <testsuite_hooks.h> 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 6a8f5d72c0d00df61d44cdb2d429f398688a61d5..60e43c9a78b2310fa6f5f0da13a266067f945f7e 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> 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 273855a0b64a874bda1bd908ba117884ba2d5fde..b850215eaeccb84008d146721a956f77fbd4101a 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 233773193ee620dd3991fbb10a52e701ee67bf02..204dddeb3321547e81244aade3f3fea911e95a98 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // 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 2cb9ea7fe937f2679df8e9715f6b6b03800a1054..3b0226918b7b476f07ca82045e34898ccb113402 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 <istream> #include <sstream> -#include <fstream> #include <testsuite_hooks.h> // libstdc++/8348