2004-03-09 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/23_containers/deque/modifiers/swap.cc: Add in bits for
	non-weak systems.
	* testsuite/23_containers/vector/modifiers/swap.cc: Same.
	* testsuite/23_containers/set/modifiers/swap.cc: Same.
	* testsuite/23_containers/multiset/modifiers/swap.cc: Same.
	* testsuite/23_containers/multimap/modifiers/swap.cc: Same.
	* testsuite/23_containers/map/modifiers/swap.cc: Same.
	* testsuite/23_containers/list/modifiers/swap.cc: Same.

	* testsuite/22_locale/locale/cons/12658_thread.cc: Catch exceptions.


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

1 files changed, 15 insertions, 12 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc
index 1a0534fa240..3a89d371f62 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread.cc
@@ -32,20 +32,23 @@ const int max_locales = 10;
  
 void* thread_main(void*)
 {
-  std::locale loc_c = std::locale::classic();
-  std::locale loc[max_locales];
-  for (int j = 0; j < max_locales; ++j)
-    loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
-
-  for (int i = 0; i < max_loop_count; ++i)
+  try
     {
-      int k = i % max_locales;
-      loc[k] = std::locale::global(loc[k]);
+      std::locale loc_c = std::locale::classic();
+      std::locale loc[max_locales];
+      for (int j = 0; j < max_locales; ++j)
+	loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
       
-      if (i % 37 == 0)
-	loc[k] = loc[k].combine<std::ctype<char> >(loc_c);
+      for (int i = 0; i < max_loop_count; ++i)
+	{
+	  int k = i % max_locales;
+	  loc[k] = std::locale::global(loc[k]);
+	  
+	  if (i % 37 == 0)
+	    loc[k] = loc[k].combine<std::ctype<char> >(loc_c);
+	}
     }
-
+  catch (...) { }
   return 0;
 }
  
@@ -53,7 +56,7 @@ int
 main()
 {
   pthread_t tid[max_thread_count];
- 
+  
   for (int i = 0; i < max_thread_count; i++)
     pthread_create (&tid[i], NULL, thread_main, 0);