8 files changed, 40 insertions, 40 deletions
diff --git a/libstdc++-v3/testsuite/25_algorithms/binary_search.cc b/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
index fda74d2a706..37019f84ede 100644
--- a/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/binary_search.cc
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 const int A[] = {1, 2, 3, 3, 3, 5, 8};
 const int C[] = {8, 5, 3, 3, 3, 2, 1};
@@ -172,12 +172,12 @@ test04()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test01();
-    test02();
-    test03();
-    test04();
-
-    return !test;
+  test01();
+  test02();
+  test03();
+  test04();
+  
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy.cc b/libstdc++-v3/testsuite/25_algorithms/copy.cc
index d8fbb9d2b00..6e699113b58 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy.cc
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 const int N = sizeof(A) / sizeof(int);
@@ -49,10 +49,10 @@ test02()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test01();
-    test02();
+  test01();
+  test02();
 
-    return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/heap.cc b/libstdc++-v3/testsuite/25_algorithms/heap.cc
index e78fae8477d..a62a9a819b6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap.cc
@@ -22,7 +22,7 @@
 //#include <cmath>
 #include <testsuite_hooks.h>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 const int A[] = {1, 11, 12, 3, 10, 6, 17, 4, 8, 2, 5, 13, 9, 15, 14, 16, 7};
 const int B[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
@@ -123,10 +123,10 @@ test02()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test01();
-    test02();
+  test01();
+  test02();
 
-    return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
index a3a23050165..6afb28fffbc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound.cc
@@ -28,5 +28,5 @@ bool operator< (const foo&, const foo&) { return true; };
 
 void bar(foo* a, foo* b, foo& x)
 {
-  foo* c = std::lower_bound(a, b, x);
+  foo* c __attribute__((unused)) = std::lower_bound(a, b, x);
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/min_max.cc b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
index ef8acfd249f..bd07009c015 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min_max.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
@@ -24,7 +24,7 @@
 
 void test01()
 {
-  bool test = true;
+  bool test __attribute__((unused)) = true;
 
   const int& x = std::max(1, 2);
   const int& y = std::max(4, 3);
@@ -74,7 +74,7 @@ template int A<long double>::a;
 
 void test02()
 {
-  bool test = true;
+  bool test __attribute__((unused)) = true;
 
   VERIFY( 2 == std::min(A<int>::a, 2) );
   VERIFY( 3 == std::min(A<int>::a, 4) );
diff --git a/libstdc++-v3/testsuite/25_algorithms/partition.cc b/libstdc++-v3/testsuite/25_algorithms/partition.cc
index 3424dcf80fd..b05c203bd32 100644
--- a/libstdc++-v3/testsuite/25_algorithms/partition.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/partition.cc
@@ -22,7 +22,7 @@
 #include <functional>
 #include <testsuite_hooks.h>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
 const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17};
@@ -64,10 +64,10 @@ test02()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test01();
-    test02();
+  test01();
+  test02();
 
-    return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate.cc b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
index 5102a649fdc..2c0487706ea 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
@@ -22,7 +22,7 @@
 #include <testsuite_hooks.h>
 #include <list>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 int A[] = {1, 2, 3, 4, 5, 6, 7};
 int B[] = {2, 3, 4, 5, 6, 7, 1};
@@ -72,9 +72,9 @@ test03()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test02();
-    test03();
-    return !test;
+  test02();
+  test03();
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/25_algorithms/sort.cc b/libstdc++-v3/testsuite/25_algorithms/sort.cc
index 2fcc6384ccf..f1fa87cd42b 100644
--- a/libstdc++-v3/testsuite/25_algorithms/sort.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/sort.cc
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <testsuite_hooks.h>
 
-bool test = true;
+bool test __attribute__((unused)) = true;
 
 const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
 const int B[] = {10, 20, 1, 11, 2, 12, 3, 13, 4, 14, 5, 15, 6, 16, 7, 17, 8, 18, 9, 19};
@@ -159,13 +159,13 @@ test05()
 }
 
 int
-main(int argc, char* argv[])
+main()
 {
-    test01();
-    test02();
-    test03();
-    test04();
-    test05();
-
-    return !test;
+  test01();
+  test02();
+  test03();
+  test04();
+  test05();
+  
+  return 0;
 }