2003-09-23 Benjamin Kosnik <bkoz@redhat.com>

	* include/bits/locale_facets.tcc: Tweak to avoid warnings.
	* testsuite/testsuite_hooks.h: Same.
	* testsuite/*/*.cc: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71693 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 20 insertions, 32 deletions

diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
index 31b176bcbf6..e331e69b07d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
@@ -37,10 +37,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c3;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -58,7 +56,7 @@ void test05()
    }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
index 275def18397..94b4c624ae5 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc
@@ -38,10 +38,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c1, c2;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -65,7 +63,7 @@ void test05()
   }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
index 09086b07d60..6219b34062e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc
@@ -37,10 +37,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c1, c2;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -64,7 +62,7 @@ void test05()
   }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
index 680e058a904..70ef74bf1c0 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
@@ -37,10 +37,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c3;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -59,7 +57,7 @@ void test05()
    }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
index abbdea55fbd..069982adae9 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
@@ -38,10 +38,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c1, c2;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -64,7 +62,7 @@ void test05()
   }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
index 78e2b4eb3d6..d0a24ddb60d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc
@@ -37,10 +37,8 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
-  streamsize 			strmsz_1, strmsz_2;
-  int 					i = 0, j = 0, k = 0;
-  int_type 			c1, c2, c3;
+  bool test __attribute__((unused)) = true;
+  int_type 			c1, c2;
 
   // int_type sputc(char_type c)
   // if out_cur not avail, return overflow(traits_type::to_int_type(c)) 
@@ -65,7 +63,7 @@ void test05()
   }
 }
 
-main() 
+int main() 
 {
   test05();
   return 0;
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
index 1d100dd3ede..85941c81b2d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/9701-2.cc
@@ -46,7 +46,7 @@ public:
 // libstdc++/9701 (partial)
 void test11()
 {
-  bool test = true;
+  bool test __attribute__((unused)) = true;
 
   bool over_expected;
 
@@ -64,7 +64,7 @@ void test11()
   dfbuf_01.close();
 }
 
-main() 
+int main() 
 {
   test11();
   return 0;