diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 338228da8fae62fa3d2f5189a2cbb15aad5f941a..540c73ab2a3353985b40f87a881f1b0d6e6c7b6b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,107 @@
+2005-03-16 Paolo Carlini <pcarlini@suse.de>
+
+ * testsuite/20_util/functional/binders.cc: Remove explicit
+ instantiations for non-weak systems.
+ * testsuite/20_util/memory/allocator/1.cc: Likewise.
+ * testsuite/20_util/memory/allocator/10378.cc: Likewise.
+ * testsuite/20_util/memory/allocator/10416.cc: Likewise.
+ * testsuite/20_util/memory/allocator/8230.cc: Likewise.
+ * testsuite/20_util/utility/rel_ops.cc: Likewise.
+ * testsuite/22_locale/ctype/is/char/2.cc: Likewise.
+ * testsuite/22_locale/ctype/is/wchar_t/2.cc: Likewise.
+ * testsuite/23_containers/deque/cons/1.cc: Likewise.
+ * testsuite/23_containers/deque/cons/2.cc: Likewise.
+ * testsuite/23_containers/deque/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/deque/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/deque/invalidation/3.cc: Likewise.
+ * testsuite/23_containers/deque/invalidation/4.cc: Likewise.
+ * testsuite/23_containers/deque/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/deque/operators/1.cc: Likewise.
+ * testsuite/23_containers/list/capacity/1.cc: Likewise.
+ * testsuite/23_containers/list/cons/1.cc: Likewise.
+ * testsuite/23_containers/list/cons/2.cc: Likewise.
+ * testsuite/23_containers/list/cons/3.cc: Likewise.
+ * testsuite/23_containers/list/cons/4.cc: Likewise.
+ * testsuite/23_containers/list/cons/5.cc: Likewise.
+ * testsuite/23_containers/list/cons/6.cc: Likewise.
+ * testsuite/23_containers/list/cons/7.cc: Likewise.
+ * testsuite/23_containers/list/cons/8.cc: Likewise.
+ * testsuite/23_containers/list/cons/9.cc: Likewise.
+ * testsuite/23_containers/list/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/list/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/list/invalidation/3.cc: Likewise.
+ * testsuite/23_containers/list/invalidation/4.cc: Likewise.
+ * testsuite/23_containers/list/modifiers/1.cc: Likewise.
+ * testsuite/23_containers/list/modifiers/2.cc: Likewise.
+ * testsuite/23_containers/list/modifiers/3.cc: Likewise.
+ * testsuite/23_containers/list/operators/1.cc: Likewise.
+ * testsuite/23_containers/list/operators/2.cc: Likewise.
+ * testsuite/23_containers/list/operators/3.cc: Likewise.
+ * testsuite/23_containers/list/operators/4.cc: Likewise.
+ * testsuite/23_containers/map/insert/1.cc: Likewise.
+ * testsuite/23_containers/map/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/map/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/map/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/map/operators/1.cc: Likewise.
+ * testsuite/23_containers/multimap/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/multimap/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/multimap/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/multiset/insert/1.cc: Likewise.
+ * testsuite/23_containers/multiset/insert/2.cc: Likewise.
+ * testsuite/23_containers/multiset/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/multiset/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/multiset/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/priority_queue/members/7161.cc: Likewise.
+ * testsuite/23_containers/queue/members/7157.cc: Likewise.
+ * testsuite/23_containers/set/insert/1.cc: Likewise.
+ * testsuite/23_containers/set/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/set/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/set/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/stack/members/7158.cc: Likewise.
+ * testsuite/23_containers/vector/bool/6886.cc: Likewise.
+ * testsuite/23_containers/vector/capacity/1.cc: Likewise.
+ * testsuite/23_containers/vector/capacity/8230.cc: Likewise.
+ * testsuite/23_containers/vector/cons/1.cc: Likewise.
+ * testsuite/23_containers/vector/cons/2.cc: Likewise.
+ * testsuite/23_containers/vector/cons/3.cc: Likewise.
+ * testsuite/23_containers/vector/cons/6513.cc: Likewise.
+ * testsuite/23_containers/vector/element_access/1.cc: Likewise.
+ * testsuite/23_containers/vector/invalidation/1.cc: Likewise.
+ * testsuite/23_containers/vector/invalidation/2.cc: Likewise.
+ * testsuite/23_containers/vector/invalidation/3.cc: Likewise.
+ * testsuite/23_containers/vector/invalidation/4.cc: Likewise.
+ * testsuite/23_containers/vector/modifiers/1.cc: Likewise.
+ * testsuite/23_containers/vector/modifiers/2.cc: Likewise.
+ * testsuite/23_containers/vector/modifiers/swap.cc: Likewise.
+ * testsuite/23_containers/vector/resize/1.cc: Likewise.
+ * testsuite/24_iterators/back_insert_iterator.cc: Likewise.
+ * testsuite/24_iterators/front_insert_iterator.cc: Likewise.
+ * testsuite/24_iterators/insert_iterator.cc: Likewise.
+ * testsuite/24_iterators/iterator.cc: Likewise.
+ * testsuite/25_algorithms/copy/1.cc: Likewise.
+ * testsuite/25_algorithms/copy/2.cc: Likewise.
+ * testsuite/25_algorithms/copy/3.cc: Likewise.
+ * testsuite/25_algorithms/copy/4.cc: Likewise.
+ * testsuite/25_algorithms/equal.cc: Likewise.
+ * testsuite/25_algorithms/fill/1.cc: Likewise.
+ * testsuite/25_algorithms/fill/2.cc: Likewise.
+ * testsuite/25_algorithms/min_max.cc: Likewise.
+ * testsuite/25_algorithms/rotate.cc: Likewise.
+ * testsuite/25_algorithms/unique/1.cc: Likewise.
+ * testsuite/25_algorithms/unique/2.cc: Likewise.
+ * testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc: Likewise.
+ * testsuite/ext/concept_checks.cc: Likewise.
+ * testsuite/ext/hash_map/1.cc: Likewise.
+ * testsuite/ext/hash_set/1.cc: Likewise.
+ * testsuite/ext/rope/1.cc: Likewise.
+ * testsuite/ext/rope/2.cc: Likewise.
+ * testsuite/ext/rope/3.cc: Likewise.
+ * testsuite/thread/pthread1.cc: Likewise.
+ * testsuite/thread/pthread4.cc: Likewise.
+ * testsuite/thread/pthread5.cc: Likewise.
+ * testsuite/thread/pthread6.cc: Likewise.
+ * testsuite/thread/pthread7-rope.cc: Likewise.
+
2005-03-15 Zack Weinberg <zack@codesourcery.com>
* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
diff --git a/libstdc++-v3/testsuite/20_util/functional/binders.cc b/libstdc++-v3/testsuite/20_util/functional/binders.cc
index 28de474a41db5de0da83d74316647a89567179f3..dfcd41957d59abddfb38e3cb7cd744d559c98ad7 100644
--- a/libstdc++-v3/testsuite/20_util/functional/binders.cc
+++ b/libstdc++-v3/testsuite/20_util/functional/binders.cc
@@ -1,6 +1,6 @@
// 2001-06-11 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -43,11 +43,6 @@ void test01()
std::bind2nd(std::mem_fun_ref(&Elem::modify), 42));
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<Elem>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/20_util/memory/allocator/1.cc b/libstdc++-v3/testsuite/20_util/memory/allocator/1.cc
index d34c8daf9c95f08aeb385e06fadb8dd256718efa..28da99735ea0e4612abc871fd74b60ef90e79110 100644
--- a/libstdc++-v3/testsuite/20_util/memory/allocator/1.cc
+++ b/libstdc++-v3/testsuite/20_util/memory/allocator/1.cc
@@ -1,6 +1,6 @@
// 2001-06-14 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -43,11 +43,6 @@ void operator delete(void *v) throw()
return std::free(v);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<gnu>;
-#endif
-
void test01()
{
bool test __attribute__((unused)) = true;
diff --git a/libstdc++-v3/testsuite/20_util/memory/allocator/10378.cc b/libstdc++-v3/testsuite/20_util/memory/allocator/10378.cc
index 2ac77eaaf16e0febd3b371d68350426b571fca8f..308a2e126e8ef5fc83c8f9fd6ba9949e4a0f3510 100644
--- a/libstdc++-v3/testsuite/20_util/memory/allocator/10378.cc
+++ b/libstdc++-v3/testsuite/20_util/memory/allocator/10378.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -39,11 +39,6 @@ void test01()
uniset.push_back(Bob());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<Bob> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/20_util/memory/allocator/14176.cc b/libstdc++-v3/testsuite/20_util/memory/allocator/14176.cc
index cb8a2f5c4bf81c630a8dbcc583388341cc2f7a90..e83e46c63bf3b1e538f04f77a38ab29faef1afa3 100644
--- a/libstdc++-v3/testsuite/20_util/memory/allocator/14176.cc
+++ b/libstdc++-v3/testsuite/20_util/memory/allocator/14176.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -30,11 +30,6 @@ void test02()
a.deallocate(p, len);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/20_util/memory/allocator/8230.cc b/libstdc++-v3/testsuite/20_util/memory/allocator/8230.cc
index 95b6cbee55fb8b2b09ade1a49d89686546576f35..d8d5f691963970cc101f1fb4d9cb3b827f0ba723 100644
--- a/libstdc++-v3/testsuite/20_util/memory/allocator/8230.cc
+++ b/libstdc++-v3/testsuite/20_util/memory/allocator/8230.cc
@@ -1,6 +1,6 @@
// 2001-06-14 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -47,11 +47,6 @@ void test02()
VERIFY( test );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/20_util/utility/rel_ops.cc b/libstdc++-v3/testsuite/20_util/utility/rel_ops.cc
index b11af2a0302ad8ac9f94e74f30239bb5333f0ec1..2a121ee826434efa723c10c64df217f0502a45f4 100644
--- a/libstdc++-v3/testsuite/20_util/utility/rel_ops.cc
+++ b/libstdc++-v3/testsuite/20_util/utility/rel_ops.cc
@@ -1,6 +1,6 @@
// 2002-04-13 Paolo Carlini <pcarlini@unitus.it>
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -38,11 +38,6 @@ void test01()
vi >= v.begin();
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
index 4192b806f4a39feff3ebfd015c1f40f8622db2b7..90c8a850e5a5dc0dfec8eebc6a445febf2048799 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
@@ -1,5 +1,6 @@
// { dg-do run { xfail *-*-![linux]* } }
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -97,10 +98,6 @@ void test02()
VERIFY( v_c != v_de );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::ctype_base::mask>;
-#endif
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc
index f5a7d6d59c13ee749a48b1da881b943bccee85f5..658135b5550248b6233627fd31b511da44f4ce95 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc
@@ -1,5 +1,6 @@
// { dg-do run { xfail *-*-![linux]* } }
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -97,11 +98,6 @@ void test02()
VERIFY( v_c != v_de );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::ctype_base::mask>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
index 5a32c78eae8b8b8022c69b7f3536a7f78b488978..3e3458672a2c7b52c903e62ccc678884b26de066 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/1.cc
@@ -1,6 +1,6 @@
// 2001-12-27 pme
//
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -42,12 +42,6 @@ test01()
assert_count (0);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_test::counter>;
-template class __gnu_cxx::__mt_alloc<__gnu_test::counter*>;
-#endif
-
int main()
{
// specific bug fix checks
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
index 64365b0502cf5cbc5fe9d586d46bc26efd64bf31..81301a560a628a991bee5454d14089512d88bd65 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/cons/2.cc
@@ -1,6 +1,6 @@
// 2001-12-27 pme
//
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -499,14 +499,6 @@ test_copy_ctor_exception_safety()
// teardown
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<__gnu_test::copy_tracker>;
-template class __gnu_cxx::__mt_alloc<__gnu_test::copy_tracker*>;
-#endif
-
int main()
{
// basic functionality and standard conformance checks
diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc
index 506f0e9fad3bc56db52ac0af003dfdebf48b54fe..6bfd074523a8242671d6b263ad6961709ce94f53 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/1.cc
@@ -1,6 +1,6 @@
// Deque iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -46,12 +46,6 @@ void test01()
VERIFY(i._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc
index 9aa1e573e99ffcaedbb0fa984b8d025d6860868a..ea401a9f725a01188b2f8675ba842026bc84e7a7 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/2.cc
@@ -1,6 +1,6 @@
// Deque iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -46,12 +46,6 @@ void test02()
VERIFY(before._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc
index fe374984cfb3c80b8b2e54bac22d1e2a33ff24fb..e6978e02fd288c26e593939d7b8e28a805686f44 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/3.cc
@@ -1,6 +1,6 @@
// Deque iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -56,12 +56,6 @@ void test03()
VERIFY(at._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
index 8300fa57a75de0e86203f2224a27ee6ae4b3cf55..acbcd3ddec244123139072f5449fdd2fcfc3466b 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
@@ -1,6 +1,6 @@
// Deque iterator invalidation tests
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -68,12 +68,6 @@ void test04()
VERIFY(before._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
index 43dc6867d3d818664ce6027ca11f28ccda19289b..c835b3036357b683f1a4ffd16cdfe847c9055cbb 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -54,11 +54,6 @@ 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/deque/operators/1.cc b/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
index 20cdfaceae89edf5efd25fadcf8889a9ec18f77d..335cd9e3c84e493650b3301569605d45c03e4789 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/operators/1.cc
@@ -1,6 +1,6 @@
// 2002-05-18 Paolo Carlini <pcarlini@unitus.it>
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -77,12 +77,6 @@ void test02()
VERIFY( constend - beg > 0 );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc
index b19a7b1397863e419fc432ca53182e02c5ce462d..fd08e34e062cfd867f40994c3490478636096617 100644
--- a/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -59,11 +59,6 @@ test01()
VERIFY(list0101.size() == 0);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/1.cc b/libstdc++-v3/testsuite/23_containers/list/cons/1.cc
index 92a5992ca2bed924a96b832a4187e2d310fa9ced..b53a6da6e134a86132c58b3ac1ee74637e1a3bcf 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -71,11 +71,6 @@ test01()
// allocator checks?
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<A<B> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/2.cc b/libstdc++-v3/testsuite/23_containers/list/cons/2.cc
index b837d85a386b32ace51d943fd4e4f13286cf2c9b..a02102bffa79733587f84cbb4d02d2e0e87855c8 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/2.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -75,13 +75,6 @@ test02()
VERIFY(list0203.size() == LIST_SIZE);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<A<B> > >;
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/3.cc b/libstdc++-v3/testsuite/23_containers/list/cons/3.cc
index 61e6aefc00a8625cff6224f35a87362dfbd88d3f..3b90961aa0c738b07e7cd861f2a144ef95a653d2 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/3.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -52,11 +52,6 @@ test02D()
VERIFY(list0204.size() == LIST_SIZE);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<C> >;
-#endif
-
int main()
{
test02D();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/4.cc b/libstdc++-v3/testsuite/23_containers/list/cons/4.cc
index 4b84342fd9816dfc9e22752278a207b1618db65c..76b147d7227f1029c751e638aef1175e7b709ba3 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/4.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -58,11 +58,6 @@ test03()
VERIFY(list0302.size() == N);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/5.cc b/libstdc++-v3/testsuite/23_containers/list/cons/5.cc
index 89e5308cc885d64b7ea341fa4f34e0dd03411da1..c44ed9fdd91a2a9228734ea1fdd85e0ead72330b 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/5.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/5.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -49,11 +49,6 @@ test04()
VERIFY(list0401.size() == N);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/6.cc b/libstdc++-v3/testsuite/23_containers/list/cons/6.cc
index a302c59a9a52221b9dc587f84dacedd2345fa0b7..a44f12783722e1361acb04284b18c7d592c61da8 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/6.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/6.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -62,11 +62,6 @@ test05()
VERIFY(list0501.size() == M);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test05();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/7.cc b/libstdc++-v3/testsuite/23_containers/list/cons/7.cc
index 16a8f90261195edb505f1e2e906963bcc047014e..49d74dfb76e4a3011ba96bb34de1a77ec35aa81c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/7.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/7.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -63,11 +63,6 @@ test06()
VERIFY(list0601.size() == SMALL_LIST_SIZE);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test06();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/8.cc b/libstdc++-v3/testsuite/23_containers/list/cons/8.cc
index 1d70d3c8978469c4e2d52879d3b0e01653f98d9a..430dc9cd2e4c79709279114596e3f3ab7c17ec18 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/8.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/8.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -56,11 +56,6 @@ test06D()
VERIFY(list0604.size() == LIST_SIZE);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<C> >;
-#endif
-
int main()
{
test06D();
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/9.cc b/libstdc++-v3/testsuite/23_containers/list/cons/9.cc
index 21a1e5847148fee968ffe26b6498b5871651d81c..f83363021feea76e0db114157cf7104d512bec48 100644
--- a/libstdc++-v3/testsuite/23_containers/list/cons/9.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/cons/9.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -56,11 +56,6 @@ test07()
VERIFY(list0702 == list0701);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test07();
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
index 571a69b473daeb99bab532a28d16676412a0d46c..4812a56f105d2408eea317603fdf9a3c2dac966a 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
@@ -1,6 +1,6 @@
// List iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -53,11 +53,6 @@ void test01()
VERIFY(!finish._M_dereferenceable() && !finish._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
index e6b04bdf3716cb905f972f5a4dd36488c0884fe5..a793997edae3db2d3bdd1cc5336ed97c05a6e637 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
@@ -1,6 +1,6 @@
// List iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -48,11 +48,6 @@ void test02()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
index 58493078b83db34e189c4fdaa03dcfd289553425..4691c81fbd515e90343e82752ee73efedb0ed15c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
@@ -1,6 +1,6 @@
// List iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -71,11 +71,6 @@ void test03()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
index 3c11fd6733cf306f542f0e585dffcd4629d0da96..a831b4893de7186724a3d414b550f5abb086c840 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
@@ -1,6 +1,6 @@
// List iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -48,11 +48,6 @@ void test04()
VERIFY(after2._M_attached_to(&l2));
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc
index 5d95467b9957a303b61ad2acaee760b43fba7526..ba00fdf95a571145b208fbef981a38939f96b329 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -112,12 +112,6 @@ test03()
VERIFY(e == list0301.end());
}
-#if !__GXX_WEAK__ && defined(_MT_ALLOCATOR_H)
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_test::copy_tracker>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<__gnu_test::copy_tracker> >;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc
index 21c8b73e687621d35ac275f86473e6f331dbc01f..6aca9d9460e57d5202e2b118e226939db720d870 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -84,12 +84,6 @@ test02()
VERIFY(T::dtorCount() == 0);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_test::copy_tracker>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<__gnu_test::copy_tracker> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc
index dda9d9afee242f92b8449ca8592ec3e09ab69a3f..720310f5501f5f75de33e8a49b06b5bcfb65a3aa 100644
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -116,12 +116,6 @@ test01()
VERIFY(k->id() == 1);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_test::copy_tracker>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<__gnu_test::copy_tracker> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/list/operators/1.cc b/libstdc++-v3/testsuite/23_containers/list/operators/1.cc
index 1b837751a210c6200ecb6885ef172ea9dd778b4d..7848fa027c7994704f9c5960d4aa2ea9d4c7097e 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operators/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -66,11 +66,6 @@ test01()
VERIFY(p == list0101.end());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main(void)
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/list/operators/2.cc b/libstdc++-v3/testsuite/23_containers/list/operators/2.cc
index 4cdc27e664d65399d168eee4ac36407f7f3d26f7..90af8c52299b0401d375e8ef69637cdad85c6f4d 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operators/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operators/2.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -52,11 +52,6 @@ test02()
VERIFY(list0201 == list0204);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/list/operators/3.cc b/libstdc++-v3/testsuite/23_containers/list/operators/3.cc
index 4919cd1e80eb8b4e8a4e14a9eb5ba136f0bf65af..37e14b7140d03730414c6791e8cfdb41cb9786ce 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operators/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operators/3.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -66,11 +66,6 @@ test03()
VERIFY(list0301 == list0304);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main(void)
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/list/operators/4.cc b/libstdc++-v3/testsuite/23_containers/list/operators/4.cc
index 2bfe127653ddf020e68891a14861ff4c3ab7bfbb..caf13b50bb26d0b704e02263755ec0b85b63e579 100644
--- a/libstdc++-v3/testsuite/23_containers/list/operators/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/operators/4.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -90,11 +90,6 @@ test04()
#endif
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/map/insert/1.cc b/libstdc++-v3/testsuite/23_containers/map/insert/1.cc
index 8c15aec5352cc69f5ae154ae93f68e0a7a0db792..33bee2f679b55e0e261dd471ca60b471c74f5611 100644
--- a/libstdc++-v3/testsuite/23_containers/map/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/insert/1.cc
@@ -1,6 +1,6 @@
// 2001-08-23 pme & Sylvain.Pion@sophia.inria.fr
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -60,12 +60,6 @@ void test01()
VERIFY ( M.find(9) != M.end() );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::pair<int const, int> >;
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc
index 667c66338afacfd28ca5dbdff8d2823fe6bdd1cb..2e9c24f8a5e4384f2f433a9c12fcff5eb0e8b1bf 100644
--- a/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/1.cc
@@ -1,6 +1,6 @@
// Map iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -45,11 +45,6 @@ void test01()
VERIFY(!finish._M_dereferenceable() && !finish._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
index b35d70ebdf59cd618a381071c39f51d345b26aa0..eac7aeaa37f50abfbf5b3b33a6a1d0f261a2beb5 100644
--- a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
@@ -1,6 +1,6 @@
// Map iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -64,11 +64,6 @@ void test02()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
index b283b1c358b5542f49db31e72de627f1e1ac2adb..889ac69aa558d7900363ce625ebe6babbb5c8c3e 100644
--- a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,10 +57,6 @@ 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/map/operators/1.cc b/libstdc++-v3/testsuite/23_containers/map/operators/1.cc
index 4a54f38896289ddf67e6af95fc9007d6ea4e7f53..2da51e86805b1b92e2af2d024034835f91259a89 100644
--- a/libstdc++-v3/testsuite/23_containers/map/operators/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/operators/1.cc
@@ -1,6 +1,6 @@
// 2000-09-07 bgarcia@laurelnetworks.com
-// Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -42,11 +42,6 @@ void test02()
std::cerr << i->second << ' ';
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
index 6246604d1cf98c34ca4b407a55226ec3bcb54c46..69bb529a1efbb05c1bcfe40bb076f207dc468472 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
@@ -1,6 +1,6 @@
// Multimap iterator invalidation tests
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -46,11 +46,6 @@ void test01()
VERIFY(!finish._M_dereferenceable() && !finish._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
index 07fe8d62fae73e1a9aab663fc03c9103066f8a81..1de9d278a77aaa71dfb9eabe34ed093192844824 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
@@ -1,6 +1,6 @@
// Multimap iterator invalidation tests
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -65,11 +65,6 @@ void test02()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int> > >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
index cc50a53990df90ed8f88236dcacc10f66814e27f..5a17d76a6e006140b3caec2eee117de5a4b2fb1c 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,10 +57,6 @@ 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/insert/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
index 4c9dc80d45e0b2cc9b4263d3e6f6f80c18c08941..38de31389ead029e51cbdf37ff74d3a87204c704 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
@@ -1,6 +1,6 @@
// 1999-06-24 bkoz
-// Copyright (C) 1999, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -37,11 +37,6 @@ bool
operator<(std::pair<int, int> const& lhs, std::pair<int, int> const& rhs)
{ return lhs.first < rhs.first; }
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int, int> > >;
-#endif
-
int main ()
{
bool test __attribute__((unused)) = true;
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/insert/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/insert/2.cc
index 6f586e4eac1d4e75eecbf3a9f60e78cdadfb753d..8acf859c07dc36a224f4a6fdc552c6e607b2b96d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/insert/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/insert/2.cc
@@ -85,11 +85,6 @@ void test01()
VERIFY( ms0 == ms1 );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main ()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
index c5c9106057d1687ebf3e2c7c0ec4e149d5787bb5..d860183e0dafeb9c983d84de17941232f7377d2d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
@@ -1,6 +1,6 @@
// Multiset iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -45,11 +45,6 @@ void test01()
VERIFY(!finish._M_dereferenceable() && !finish._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
index e016817087850d8dd8d01648493579d778ef29af..1a2ec3612b40e9b20bace145a5973cc1ee73dc2d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
@@ -1,6 +1,6 @@
// Multiset iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -63,11 +63,6 @@ void test02()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
index 4b422649a6a7a63b304117659a1c1fe2887ba5ac..5c9315415ecc806685d47f3a74b71d13b20d45be 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,10 +57,6 @@ 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/priority_queue/members/7161.cc b/libstdc++-v3/testsuite/23_containers/priority_queue/members/7161.cc
index 613a924c84a29b7e0574e99ac4b651f750807920..64c68c5e25fcbb093cf13803c6b5ab3430509bdb 100644
--- a/libstdc++-v3/testsuite/23_containers/priority_queue/members/7161.cc
+++ b/libstdc++-v3/testsuite/23_containers/priority_queue/members/7161.cc
@@ -1,6 +1,6 @@
// 2002-06-28 pme
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -43,11 +43,6 @@ test03()
pq.pop();
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/queue/members/7157.cc b/libstdc++-v3/testsuite/23_containers/queue/members/7157.cc
index b0875d0620568c1294b008f99073d3082f78af85..523d50a66dabe89166cc8424be687730505162f3 100644
--- a/libstdc++-v3/testsuite/23_containers/queue/members/7157.cc
+++ b/libstdc++-v3/testsuite/23_containers/queue/members/7157.cc
@@ -1,6 +1,6 @@
// 2002-06-28 pme
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -34,12 +34,6 @@ test01()
q.pop();
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<int*>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/set/insert/1.cc b/libstdc++-v3/testsuite/23_containers/set/insert/1.cc
index 7d1ef2f9d34259d2194bf18b98e0d252d68c9024..0bd42fe02abed662f45e26254dd098b17c23e984 100644
--- a/libstdc++-v3/testsuite/23_containers/set/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/insert/1.cc
@@ -85,11 +85,6 @@ void test01()
VERIFY( s0 == s1 );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main ()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
index 071d9e22c20a7992148fd11826098d3c8dc3196a..f279c28101f96ba3b4d99f4787c48bff734bb652 100644
--- a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
@@ -1,6 +1,6 @@
// Set iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -45,11 +45,6 @@ void test01()
VERIFY(!finish._M_dereferenceable() && !finish._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
index 0978b815f5b75c0614190ff37b3681a5703a839b..96be957a5cb8e818d06861ed99546687a6279c4e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
@@ -1,6 +1,6 @@
// Set iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -64,11 +64,6 @@ void test02()
VERIFY(!finish._M_singular() && !finish._M_dereferenceable());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
index 43525ff5a85279f3a1f58a1b8fd2488543fa3484..6cde4f1ff7c1631a4253a24782dfefb53b5184e4 100644
--- a/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,10 +57,6 @@ 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/stack/members/7158.cc b/libstdc++-v3/testsuite/23_containers/stack/members/7158.cc
index bbb5bbd142af542946393e4e85b3ee95f2495833..a3d173a7f84cac223f82ce595133da9368bb73a8 100644
--- a/libstdc++-v3/testsuite/23_containers/stack/members/7158.cc
+++ b/libstdc++-v3/testsuite/23_containers/stack/members/7158.cc
@@ -1,6 +1,6 @@
// 2002-06-28 pme
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -34,12 +34,6 @@ test02()
st.pop();
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
index 88cac68d665f391c89100bb478c4ea7f137922b8..72a043d0e718792e37bd59c52637d29a17f1f586 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/bool/6886.cc
@@ -1,6 +1,6 @@
// 2002-03-05 Stephen M. Webb <stephen.webb@bregmasoft.com>
-// Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -47,11 +47,6 @@ void test02()
VERIFY( num == 4 );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<unsigned long>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
index 8ac1f0f7c7f84bc3144e9108a12f22933a86b2ad..70e1482fb59347b9380cf4997c18a32b9ad36c2c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/1.cc
@@ -1,7 +1,8 @@
// 1999-05-07
// bkoz
-// Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -54,11 +55,6 @@ void test01()
VERIFY( sz01 == sz02 );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<A<B> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
index 759fc7507d34cc8b8abfeeeb5933959d8a39a00b..8dd88ec530efa5c0f56f303825892e9b3c68cd67 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/8230.cc
@@ -1,7 +1,7 @@
// 1999-05-07
// bkoz
-// Copyright (C) 1999, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -71,11 +71,6 @@ void test02()
}
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/1.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/1.cc
index 5c212db9b65744ef8fa59a916577538e07771712..fe618e6253b59b09f9de35f50e7ce7911ddb6a1a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/1.cc
@@ -1,6 +1,7 @@
// 1999-06-29 bkoz
-// Copyright (C) 1999-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999-2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -40,11 +41,6 @@ void test01()
vec01 = vec02;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<A<B> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/2.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/2.cc
index ecee79d85d50a93c5a0fd6aeb5b3e40aae1de8a5..629195ee93e733b6f0825caf8ba269ea26edd940 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/2.cc
@@ -1,6 +1,7 @@
// 1999-06-29 bkoz
-// Copyright (C) 1999-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999-2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -41,13 +42,6 @@ void test02()
std::vector<int> v2(v1);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<double>;
-template class __gnu_cxx::__mt_alloc<A<B> >;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
index e228e7b63058e0a4d12b37cbf4dbbea7c2d32c9c..a2dcdee7366e10cc018a446f5d5a2b0c8735ab80 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/3.cc
@@ -1,6 +1,7 @@
// 1999-06-29 bkoz
-// Copyright (C) 1999-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999-2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -46,11 +47,6 @@ test03()
VERIFY(std::equal(B, B + M, v5.begin()));
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/6513.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/6513.cc
index 593b377155411222f9fdf25bc07ba8c4ee41a49d..2748a4e54cc3296ea46734d598af8ab5f46d5144 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/cons/6513.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/6513.cc
@@ -1,6 +1,7 @@
// 1999-06-29 bkoz
-// Copyright (C) 1999-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999-2001, 2002, 2003, 2004, 2005
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -32,11 +33,6 @@ void test04()
std::vector<std::string> strings(c_strings, c_strings + 5);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::string>;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc b/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
index fce524d9c475b95a2f8981f36ad6fd635409fee4..36397640765e0775464d5d969ced440b18a3693e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/element_access/1.cc
@@ -1,7 +1,7 @@
// 2000-09-06
// bkoz
-// Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -55,11 +55,6 @@ bool test01()
return test;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<A<B> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
index dcd9d7ff4dfc0e2988f32762cec040d6a3cf9cf4..634dba4aa12797de0c3fb6f090d92aa13d365dbb 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
@@ -1,6 +1,6 @@
// Vector iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -53,11 +53,6 @@ void test01()
VERIFY(i._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
index d79a2ee3ac754536da403e9bd6f83f75fae02132..d8ba4d639d0135434202c70e0cddccc123eb187c 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
@@ -1,6 +1,6 @@
// Vector iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -58,11 +58,6 @@ void test02()
VERIFY(before._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test02();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
index 0414a337ea0f060ed0c28d1a241980e302bdb083..ac7f9ec99cefde6d59beceb1c853ed06f2763781 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
@@ -1,6 +1,6 @@
// Vector iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -83,11 +83,6 @@ void test03()
VERIFY(before._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
index 184db02a2255ced0d37850e4c65806bb342fbeda..1189f3cc3e5165341a5220531a2f6c4297cb336d 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
@@ -1,6 +1,6 @@
// Vector iterator invalidation tests
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -60,11 +60,6 @@ void test04()
VERIFY(before._M_singular());
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test04();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
index 52374e70d806cb6009638f462db6fa51ca3304fc..e9e61cbfb763aa237007c98799ff5be72bafcb4a 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/1.cc
@@ -1,6 +1,6 @@
// 1999-11-09 bkoz
-// Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -49,12 +49,6 @@ test01()
vec02.insert(vec02.begin(), pnp01, pnp01 + 1);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<A<B> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
index 0e68bfa69890f82c9afda01748a6286604a5e9cd..9cb276b394c44733f420c1b551d53b66200d0b98 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/2.cc
@@ -1,6 +1,6 @@
// 1999-11-09 bkoz
-// Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -55,11 +55,6 @@ test03()
VERIFY((v4.size() == M) && (M != N));
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test03();
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
index 4e49635bc2249fe5a3fd07a87aa927c2fa2ed2ba..decaab0026f946b5b266827e221b618b96da83f9 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/swap.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -54,10 +54,6 @@ 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()
{
diff --git a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc
index b5b31e8d1ae0b7828ab21da81dafe1ad529695cb..d3deb0d9cf292a9d4d246613bd5e814d9b35d7c6 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/resize/1.cc
@@ -1,7 +1,7 @@
// 1999-05-07
// bkoz
-// Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -50,11 +50,6 @@ void test01()
VERIFY( test );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator.cc b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator.cc
index 2ca14a786135d11618500a219774ad72304059d8..f7a26e74c2c1ae37091fa16150a2727d4d33af1f 100644
--- a/libstdc++-v3/testsuite/24_iterators/back_insert_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/back_insert_iterator.cc
@@ -1,6 +1,6 @@
// 2001-06-21 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -63,11 +63,6 @@ public:
test_dm(): std::back_insert_iterator<std::list<int> >(l), p(container) { }
};
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator.cc b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator.cc
index 9ee2e9fd3fabb08bb53b445afb84c5367b19bf61..644f9c8b444dc8fba89a2369b8d686534b6deb9b 100644
--- a/libstdc++-v3/testsuite/24_iterators/front_insert_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/front_insert_iterator.cc
@@ -1,6 +1,6 @@
// 2001-06-21 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -62,11 +62,6 @@ public:
test_dm(): std::front_insert_iterator<std::list<int> >(l), p(container) { }
};
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/24_iterators/insert_iterator.cc b/libstdc++-v3/testsuite/24_iterators/insert_iterator.cc
index 322bccf4ea3a816ec162eeb367381fccb4401314..f76e08e97717cf226aff8e033da1802e835bed0a 100644
--- a/libstdc++-v3/testsuite/24_iterators/insert_iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/insert_iterator.cc
@@ -1,6 +1,6 @@
// 2001-06-21 Benjamin Kosnik <bkoz@redhat.com>
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -70,11 +70,6 @@ public:
test_dm(): std::insert_iterator<std::list<int> >(l, i), p(container) { }
};
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/24_iterators/iterator.cc b/libstdc++-v3/testsuite/24_iterators/iterator.cc
index b3f4c67ed899d05e2c1227eb81d7f8bd089cc516..8573d41abfad64473b50aa6728b5aad6c666d20a 100644
--- a/libstdc++-v3/testsuite/24_iterators/iterator.cc
+++ b/libstdc++-v3/testsuite/24_iterators/iterator.cc
@@ -2,7 +2,7 @@
// 24.3.1 Iterator traits
// (basic_string and vector implementations)
//
-// Copyright (C) 1999, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2003, 2004, 2005 Free Software Foundation, Inc.
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
@@ -588,12 +588,6 @@ test6642()
return it - cit;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<std::string>;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
index 2ad90ae978e5c12432d4535bb2c441aee08d7883..ed56c97fd492612dbda1be6f86e41a48411f0be9 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -56,11 +56,6 @@ test01()
VERIFY( equal(s2, s2 + N, A) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
index 54bc439dac28e901c8a04cbfb4359b0c605c2058..bc9147d5289a493add371d363c8388c553a6b034 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/2.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,11 +57,6 @@ test01()
VERIFY( equal(s2, s2 + N, a.begin()) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
index c3f7979d8b9f3b3e49bc30dc4343294d1334ca08..f6ad8b4cde872393edf1d8f2bbd10e1a1f85dce7 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/3.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -58,12 +58,6 @@ test01()
VERIFY( equal(s2, s2 + N, a.begin()) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int*>;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
index edd089de313701760c5f9f52f95f8c9884e79857..cee7cc9d62134a343940eefc6766479ede371caf 100644
--- a/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/copy/4.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -58,12 +58,6 @@ test01()
VERIFY( equal(s2, s2 + N, a.begin()) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-template class __gnu_cxx::__mt_alloc<int>;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/equal.cc b/libstdc++-v3/testsuite/25_algorithms/equal.cc
index d9743bedc10b53de40498cf5d92281557f70c716..abb0446be210927c564339c4a0723e504ba2139f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/equal.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/equal.cc
@@ -1,6 +1,6 @@
// 2001-04-06 gdr
-// Copyright (C) 2000 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -33,11 +33,6 @@ bool operator==(X, X) { return true; }
// Not implemented on purpose. { dg-do link }
bool operator!=(X, X);
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<X>;
-#endif
-
int main()
{
std::vector<X> v, w;
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/1.cc b/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
index 00830cbfbdf29cc0ba5416db23dd3468d2e36ce1..64c071c384b1660f66b0c1d533b5dfbc3d8ee104 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/1.cc
@@ -1,6 +1,6 @@
// 2004-06-25 Paolo Carlini <pcarlini@suse.de>
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,12 +57,6 @@ void test01()
VERIFY( equal(coll2.begin(), coll2.end(), V) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-template class __gnu_cxx::__mt_alloc<std::_List_node<num> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/2.cc b/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
index 51c45f31cbff8d39326a34a6d4d1ddfd7c84d2b2..18ae2ee39c66a0b718457f37f3e12afa7c372516 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/2.cc
@@ -1,6 +1,6 @@
// 2004-06-25 Paolo Carlini <pcarlini@suse.de>
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -57,12 +57,6 @@ void test01()
VERIFY( equal(coll2.begin(), coll2.end(), V) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-template class __gnu_cxx::__mt_alloc<std::_List_node<num> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/25_algorithms/min_max.cc b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
index 8e5afb188291f02fa62e0ee97a92530b4c819177..4a3b35a69f9e4ff3859e2fec628d244fa369ad2c 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min_max.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
@@ -1,6 +1,6 @@
// 2000-03-29 sss/bkoz
-// Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -53,25 +53,6 @@ template<typename T>
template<typename T>
const T A<T>::a = T(3);
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template int A<int>::a;
-template int A<unsigned int>::a;
-template int A<short>::a;
-template int A<unsigned short>::a;
-template int A<long>::a;
-template int A<unsigned long>::a;
-template int A<long long>::a;
-template int A<unsigned long long>::a;
-template int A<char>::a;
-template int A<signed char>::a;
-template int A<unsigned char>::a;
-template int A<wchar_t>::a;
-template int A<float>::a;
-template int A<double>::a;
-template int A<long double>::a;
-#endif
-
void test02()
{
bool test __attribute__((unused)) = true;
diff --git a/libstdc++-v3/testsuite/25_algorithms/rotate.cc b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
index d37209d19d1ffb5c72e0e4de5c639b528e215c98..00768a230c8b62a80a8be1c5e89ba7e52b207f0d 100644
--- a/libstdc++-v3/testsuite/25_algorithms/rotate.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/rotate.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -71,11 +71,6 @@ test03()
VERIFY(std::equal(A, A + N, D));
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int
main()
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/1.cc b/libstdc++-v3/testsuite/25_algorithms/unique/1.cc
index 658e26b0fefda3e3101646d1a5e588b99d7ed9fc..1c503cb756a1d11ecaf326d760954c47675ca8fa 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique/1.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/1.cc
@@ -1,6 +1,6 @@
// 2001-07-19 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -23,11 +23,6 @@
#include <list>
#include <algorithm>
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
using namespace std;
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/2.cc b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
index 65b09b5a53e320b17206df90d6389086c9ad3be8..10039d675f5260afb3d88351740c493ae5250bf0 100644
--- a/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc
@@ -1,6 +1,6 @@
// 2003-10-14 Paolo Carlini <pcarlini@unitus.it>
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -86,11 +86,6 @@ void test03()
VERIFY( equal(coll2.begin(), pos, B3) );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
index 13adfb2a5a664c596b7f88e72fdfa5e67c534711..fbe43b826351d0a6d95a57e68831644e8645bf28 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
@@ -1,6 +1,6 @@
// 2003-10-07 Petur Runolfsson <peturr02@ru.is>
//
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -131,11 +131,6 @@ void test01()
fb.close();
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::pair<std::fpos<__mbstate_t>, std::size_t> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/ext/concept_checks.cc b/libstdc++-v3/testsuite/ext/concept_checks.cc
index 67a771ac07edb251bce34bd09b886fa56b539f21..644caf4f32360007b905f2c2e72b381eab8cd8f0 100644
--- a/libstdc++-v3/testsuite/ext/concept_checks.cc
+++ b/libstdc++-v3/testsuite/ext/concept_checks.cc
@@ -1,6 +1,6 @@
// 2001-12-28 Phil Edwards <pme@gcc.gnu.org>
//
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -76,12 +76,6 @@ test2054( )
binary_search(Index.begin(), Index.end(), SearchTerm, aComparison);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<int>;
-template class __gnu_cxx::__mt_alloc<std::string>;
-#endif
-
int main()
{
test2054();
diff --git a/libstdc++-v3/testsuite/ext/hash_map/1.cc b/libstdc++-v3/testsuite/ext/hash_map/1.cc
index 2a0bc0bce6d8dac7f6fc6d0a965de795a5a06cee..1b5d6f0ed910311f13b6141d3c32eb6c0787826d 100644
--- a/libstdc++-v3/testsuite/ext/hash_map/1.cc
+++ b/libstdc++-v3/testsuite/ext/hash_map/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2002 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -95,13 +95,6 @@ void test01()
}
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Hashtable_node<std::pair<const std::string, int> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Hashtable_node<std::pair<const std::string, int> >* >;
-template class __gnu_cxx::__mt_alloc<std::pair<std::string, int> >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/ext/hash_set/1.cc b/libstdc++-v3/testsuite/ext/hash_set/1.cc
index 9db82b7ef9d7ea71036b7642fc3f2dc947e340e0..afc7caec05b5b1b25250dc82775509e5958ab8f9 100644
--- a/libstdc++-v3/testsuite/ext/hash_set/1.cc
+++ b/libstdc++-v3/testsuite/ext/hash_set/1.cc
@@ -1,7 +1,7 @@
// 2002-04-28 Paolo Carlini <pcarlini@unitus.it>
// Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
-// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -32,12 +32,6 @@ test01()
__gnu_cxx::hash_set<int> intTable(werte, werte + anzahl);
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Hashtable_node<int> >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Hashtable_node<int>* >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/ext/rope/1.cc b/libstdc++-v3/testsuite/ext/rope/1.cc
index b79e5e91496cfcc06a018cfcda2d5fc913fed9a8..fc1cc9aae62ce808d559832b27290bac7b1c9564 100644
--- a/libstdc++-v3/testsuite/ext/rope/1.cc
+++ b/libstdc++-v3/testsuite/ext/rope/1.cc
@@ -1,6 +1,6 @@
// 2001-10-03 From: Dimitris Vyzovitis <vyzo@media.mit.edu>
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -31,14 +31,6 @@ void test01()
std::cout << data << std::endl;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeLeaf<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeFunction<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeSubstring<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeConcatenation<char, std::allocator<char> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/ext/rope/2.cc b/libstdc++-v3/testsuite/ext/rope/2.cc
index db8519f849eed8ea1b8fdfcc2160da3af6e3154a..e331cbf9cc07f642c36ab589a978ae3c0a6e6b85 100644
--- a/libstdc++-v3/testsuite/ext/rope/2.cc
+++ b/libstdc++-v3/testsuite/ext/rope/2.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -42,14 +42,6 @@ test01()
VERIFY( r5[1] == 'a' );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeLeaf<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeFunction<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeSubstring<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeConcatenation<char, std::allocator<char> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/ext/rope/3.cc b/libstdc++-v3/testsuite/ext/rope/3.cc
index eec77d132379f32c0ed3b1125a8c003cd6de43ed..ae990ca166f83cdcd4637df640fca78e4d5efa2c 100644
--- a/libstdc++-v3/testsuite/ext/rope/3.cc
+++ b/libstdc++-v3/testsuite/ext/rope/3.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -93,14 +93,6 @@ test01()
VERIFY( r1.substr(88888, 6)[2] == 'h' );
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeLeaf<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeFunction<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeSubstring<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeConcatenation<char, std::allocator<char> > >;
-#endif
-
int main()
{
test01();
diff --git a/libstdc++-v3/testsuite/thread/pthread1.cc b/libstdc++-v3/testsuite/thread/pthread1.cc
index f83e20595af7fd6434f32d6788f31a3cfd46220a..83c0126848bf0bf26baf215cb40ac357e4afa7e8 100644
--- a/libstdc++-v3/testsuite/thread/pthread1.cc
+++ b/libstdc++-v3/testsuite/thread/pthread1.cc
@@ -1,6 +1,6 @@
// 2002-01-23 Loren J. Rittle <rittle@labs.mot.com> <ljrittle@acm.org>
//
-// Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -98,11 +98,6 @@ consume (void* t)
return 0;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
-#endif
-
int
main ()
{
diff --git a/libstdc++-v3/testsuite/thread/pthread4.cc b/libstdc++-v3/testsuite/thread/pthread4.cc
index b58445fb68eae9531606ffffc1773e714dde1a06..bab42569c453df95082d78a86948bf67a81528e9 100644
--- a/libstdc++-v3/testsuite/thread/pthread4.cc
+++ b/libstdc++-v3/testsuite/thread/pthread4.cc
@@ -2,7 +2,7 @@
// Adapted from http://gcc.gnu.org/ml/gcc-bugs/2002-01/msg00679.html
// which was adapted from pthread1.cc by Mike Lu <MLu@dynamicsoft.com>
//
-// Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -89,12 +89,6 @@ consume (void*)
return 0;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::string>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<std::string> >;
-#endif
-
int
main (void)
{
diff --git a/libstdc++-v3/testsuite/thread/pthread5.cc b/libstdc++-v3/testsuite/thread/pthread5.cc
index 30086d4584d6e9492d1176db99c8aa31d1c54417..76220fbdbd577a110d3f33c5f1ca340afe61374a 100644
--- a/libstdc++-v3/testsuite/thread/pthread5.cc
+++ b/libstdc++-v3/testsuite/thread/pthread5.cc
@@ -2,7 +2,7 @@
// Adpated from libstdc++/5464 submitted by jjessel@amadeus.net
// Jean-Francois JESSEL (Amadeus SAS Development)
//
-// Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -86,12 +86,6 @@ thread_function (void* arg)
return arg;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<tt_t>;
-template class __gnu_cxx::__mt_alloc<std::_List_node<std::string*> >;
-#endif
-
int
main ()
{
diff --git a/libstdc++-v3/testsuite/thread/pthread6.cc b/libstdc++-v3/testsuite/thread/pthread6.cc
index 44b2b8971467d7375f8d1c07b710e573e3d6c063..9bf8cd56229d1293094f0877472d43385f404d6f 100644
--- a/libstdc++-v3/testsuite/thread/pthread6.cc
+++ b/libstdc++-v3/testsuite/thread/pthread6.cc
@@ -1,7 +1,7 @@
// 2002-01-23 Loren J. Rittle <rittle@labs.mot.com> <ljrittle@acm.org>
// Adpated from libstdc++/5444 submitted by markus.breuer@materna.de
//
-// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -70,11 +70,6 @@ thread_main (void*)
return 0;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<unsigned int const, std::string> > >;
-#endif
-
int
main (void)
{
diff --git a/libstdc++-v3/testsuite/thread/pthread7-rope.cc b/libstdc++-v3/testsuite/thread/pthread7-rope.cc
index 3f5a338d08668e037322bba70a65370d39f52347..0e8431b7f3215ba79ecc689675a77ad3f7514090 100644
--- a/libstdc++-v3/testsuite/thread/pthread7-rope.cc
+++ b/libstdc++-v3/testsuite/thread/pthread7-rope.cc
@@ -1,6 +1,6 @@
// 2003-05-03 Loren J. Rittle <rittle@labs.mot.com> <ljrittle@acm.org>
//
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -53,14 +53,6 @@ void* thread_main(void *)
return 0;
}
-#if !__GXX_WEAK__ && _MT_ALLOCATOR_H
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeLeaf<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeFunction<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeSubstring<char, std::allocator<char> > >;
-template class __gnu_cxx::__mt_alloc<__gnu_cxx::_Rope_RopeConcatenation<char, std::allocator<char> > >;
-#endif
-
int
main()
{