From 6dde938c119bc55f7b7ee5aedf4f5962e98a39b0 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 10 Mar 2004 06:31:50 +0000 Subject: [PATCH] swap.cc: Add in bits for non-weak systems. 2004-03-09 Benjamin Kosnik * 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. From-SVN: r79224 --- libstdc++-v3/ChangeLog | 13 +++++++++++ .../22_locale/locale/cons/12658_thread.cc | 27 ++++++++++++---------- .../23_containers/deque/modifiers/swap.cc | 5 ++++ .../testsuite/23_containers/list/modifiers/swap.cc | 4 ++++ .../testsuite/23_containers/map/modifiers/swap.cc | 4 ++++ .../23_containers/multimap/modifiers/swap.cc | 4 ++++ .../23_containers/multiset/modifiers/swap.cc | 4 ++++ .../testsuite/23_containers/set/modifiers/swap.cc | 4 ++++ .../23_containers/vector/modifiers/swap.cc | 4 ++++ 9 files changed, 57 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1538ef3..4be32a5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2004-03-09 Benjamin Kosnik + + * 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 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 1a0534f..3a89d37 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 >(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 >(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 12cfa74..43dc686 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; +template class __gnu_cxx::__mt_alloc; +#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 d20dec0..a51d126 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 >; +#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 8fb48cb..1afde71 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 > >; +#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 34425bd..2e87dff 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 > >; +#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 809e153..b9632cb 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 >; +#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 dbf3b83..dcc69c9 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 >; +#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 3122aa19..4e49635 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; +#endif + // See c++/13658 for background info. int main() { -- 2.7.4