diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1538ef3e30e5e61dc1587330f18feb2ef18122b5..4be32a5de2dd2812472733d5e30ee497eb3bdd41 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
2004-03-08 Benjamin Kosnik <bkoz@redhat.com>
PR c++/13658
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 1a0534fa2406089d02c309b65abce80294c86ab7..3a89d371f62b97befbdfb58e08fd1ad44b5e6cd2 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);
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
index 12cfa748b4975639a50f69db27925deac161734b..43dc6867d3d818664ce6027ca11f28ccda19289b 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
@@ -54,6 +54,11 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<T>;
+template class __gnu_cxx::__mt_alloc<T*>;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap.cc
index d20dec036799315700b565169b4947c15f7f3683..a51d1263fb446f098084742252fab040a8fa0ed5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<std::_List_node<T> >;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
index 8fb48cb684315d3a22047c3a23b1baaf2da7f7a9..1afde71dd8a2acf8c22de7c89bca1c440f2f44a7 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<T const, int> > >;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
index 34425bd4cf3f213ce820df816acdf02044068c9d..2e87dff163265cb0c34f7c6e4185101ddbd3a68b 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<T const, int> > >;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
index 809e1538d1c7342f9da735d2a199aeea89917ee8..b9632cb88ae3c8f3a65ed3d311898bb5e36136fe 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<T> >;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
index dbf3b832666e6f2158910276bdfe9cfd7b396a13..dcc69c99b3af18289268712a6e54ea1d0555a03e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<T> >;
+#endif
+
// See c++/13658 for background info.
int main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
index 3122aa1955b9c8cdb7e8de233d62125c005da4b0..4e49635bc2249fe5a3fd07a87aa927c2fa2ed2ba 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
@@ -54,6 +54,10 @@ void test02()
VERIFY(1 == swap_calls);
}
+#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
+template class __gnu_cxx::__mt_alloc<T>;
+#endif
+
// See c++/13658 for background info.
int main()
{