diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 005df4237064..0df5feb701e6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,29 @@ +2004-08-11 Paolo Carlini + + * testsuite/27_io/basic_stringbuf/imbue/char/1.cc: Declare test + variable. + * testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/in_avail/char/1.cc: Remove junk. + * testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/setbuf/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sgetc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sgetn/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/snextc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputn/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sungetc/char/1.cc: Ditto. + * testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc: Ditto. + 2004-08-11 Paolo Carlini Petur Runolfsson diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc index 153d7df6a8a6..4ca9a2411efa 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -28,6 +28,8 @@ std::stringbuf strb_01(str_01); // test the streambuf/stringbuf locale settings void test02() { + bool test __attribute__((unused)) = true; + std::locale loc_c = std::locale::classic(); loc_c = strb_01.getloc(); strb_01.pubimbue(loc_c); //This should initialize _M_init to true diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc index 855580d04adf..b12e92d14760 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/1.cc @@ -28,6 +28,8 @@ std::wstringbuf strb_01(str_01); // test the streambuf/stringbuf locale settings void test02() { + bool test __attribute__((unused)) = true; + std::locale loc_c = std::locale::classic(); loc_c = strb_01.getloc(); strb_01.pubimbue(loc_c); //This should initialize _M_init to true diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc index e8e8dc9972e5..99942f766101 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,13 +33,7 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; - typedef std::stringbuf::int_type int_type; - typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // GET // int in_avail() diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc index 96fcbcdaf101..ed6f2484dbc3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/in_avail/wchar_t/1.cc @@ -33,13 +33,7 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; - typedef std::wstringbuf::int_type int_type; - typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // GET // int in_avail() diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc index df5173ae2b28..b73bb5d80f75 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,13 +33,9 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc index 188a87ee6000..4db8ac47fd28 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sbumpc/wchar_t/1.cc @@ -33,13 +33,9 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::wstringbuf::int_type int_type; - typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; + typedef std::stringbuf::traits_type traits_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc index cfed7cb319f9..662ba1208542 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -23,10 +23,8 @@ #include std::string str_01("mykonos. . . or what?"); -std::string str_02("paris, or sainte-maxime?"); std::string str_03; std::stringbuf strb_01(str_01); -std::stringbuf strb_02(str_02, std::ios_base::in); std::stringbuf strb_03(str_03, std::ios_base::out); // test overloaded virtual functions @@ -34,11 +32,6 @@ void test04() { bool test __attribute__((unused)) = true; std::string str_tmp; - std::stringbuf strb_tmp; - typedef std::stringbuf::int_type int_type; - typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // PUT strb_03.str(str_01); //reset diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc index ba01e1d395d6..4e6d3ea0e823 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/1.cc @@ -23,10 +23,8 @@ #include std::wstring str_01(L"mykonos. . . or what?"); -std::wstring str_02(L"paris, or sainte-maxime?"); std::wstring str_03; std::wstringbuf strb_01(str_01); -std::wstringbuf strb_02(str_02, std::ios_base::in); std::wstringbuf strb_03(str_03, std::ios_base::out); // test overloaded virtual functions @@ -34,11 +32,6 @@ void test04() { bool test __attribute__((unused)) = true; std::wstring str_tmp; - std::wstringbuf strb_tmp; - typedef std::wstringbuf::int_type int_type; - typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // PUT strb_03.str(str_01); //reset diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc index 274cd6159e36..9c9258436300 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,13 +33,9 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc index 5912b05ad8f3..38182de709c8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetc/wchar_t/1.cc @@ -33,13 +33,9 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc index c68ad1424b52..d95f94a5d98a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,14 +33,10 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; std::streamoff strmof_1(-1), strmof_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc index e03806831b38..8208d6f5c498 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sgetn/wchar_t/1.cc @@ -33,14 +33,10 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; std::streamoff strmof_1(-1), strmof_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc index c94342143a01..310dee1dcaa4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/char/1.cc @@ -33,13 +33,9 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc index fa82e6565944..eb2c40e24604 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/snextc/wchar_t/1.cc @@ -33,13 +33,9 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamoff strmof_1(-1), strmof_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // GET strmof_1 = strb_01.in_avail(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc index 853339e23c12..79ce099bbd06 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::string str_tmp, str_tmp2; - std::stringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc index a6e8ae623797..eed6591b24e5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputbackc/wchar_t/1.cc @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::wstring str_tmp, str_tmp2; - std::wstringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc index 5fc08f2ba9b1..241c9b999d12 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -33,12 +33,8 @@ std::stringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::string str_tmp; - std::stringbuf strb_tmp; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc index 2c749711ab43..6c9f2f62ae09 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputc/wchar_t/1.cc @@ -33,12 +33,8 @@ std::wstringbuf strb_03(str_03, std::ios_base::out); void test04() { bool test __attribute__((unused)) = true; - std::wstring str_tmp; - std::wstringbuf strb_tmp; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc index 801ae7f44bd7..23948934ff04 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::string str_tmp; - std::stringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; // PUT strb_03.str(str_01); //reset diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc index 450c2e70c981..e8ec016b511e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sputn/wchar_t/1.cc @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; // PUT strb_03.str(str_01); //reset diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc index a90885a1c6ce..1d9effcecc21 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/char/1.cc @@ -1,6 +1,6 @@ // 981208 bkoz test functionality of basic_stringbuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::string str_tmp; - std::stringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::stringbuf::int_type int_type; typedef std::stringbuf::traits_type traits_type; - typedef std::stringbuf::pos_type pos_type; - typedef std::stringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc index a25ded4362b7..f718c2c5d2a8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/sungetc/wchar_t/1.cc @@ -34,12 +34,9 @@ void test04() { bool test __attribute__((unused)) = true; std::wstring str_tmp; - std::wstringbuf strb_tmp; std::streamsize strmsz_1, strmsz_2; typedef std::wstringbuf::int_type int_type; typedef std::wstringbuf::traits_type traits_type; - typedef std::wstringbuf::pos_type pos_type; - typedef std::wstringbuf::off_type off_type; int_type c1 = strb_01.sbumpc(); int_type c2 = strb_02.sbumpc();