obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

9 files changed, 831 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/erase/51142.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/erase/51142.cc
new file mode 100644
index 000000000..c5beb6a8d
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/erase/51142.cc
@@ -0,0 +1,38 @@
+// Copyright (C) 2011 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+#include <set>
+
+struct X
+{
+  template<typename T>
+  X(T&) {}
+};
+
+bool operator<(const X&, const X&) { return false; }
+
+// LWG 2059.
+void erasor(std::multiset<X>& s, X x)
+{
+  std::multiset<X>::iterator it = s.find(x);
+  if (it != s.end())
+    s.erase(it);
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc
new file mode 100644
index 000000000..87b1d3635
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/1.cc
@@ -0,0 +1,64 @@
+// 1999-06-24 bkoz
+
+// Copyright (C) 1999, 2004, 2005, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 23.3.4 template class multiset
+
+#include <sstream>
+#include <iterator>
+#include <set>
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+namespace std 
+{
+  std::ostream& 
+  operator<<(std::ostream& os, std::pair<int, int> const& p) 
+  { return os << p.first << ' ' << p.second; }
+}
+
+bool 
+operator<(std::pair<int, int> const& lhs, std::pair<int, int> const& rhs) 
+{ return lhs.first < rhs.first; }
+
+int main () 
+{
+  bool test __attribute__((unused)) = true;
+  typedef std::multiset<std::pair<int, int> >::iterator iterator;
+  std::pair<int, int> p(69, 0);
+  std::multiset<std::pair<int, int> > s;
+
+  for (p.second = 0; p.second < 5; ++p.second)
+    s.insert(p);
+  for (iterator it = s.begin(); it != s.end(); ++it)
+    if (it->second < 5) 
+      {
+	s.insert(it, p);
+	++p.second;
+      }
+
+  std::ostringstream stream;
+  std::copy(s.begin(), s.end(), 
+            std::ostream_iterator<std::pair<int, int> >(stream, "\n"));
+  const std::string expected("69 0\n69 1\n69 2\n69 3\n69 4\n"
+			     "69 5\n69 6\n69 7\n69 8\n69 9\n");
+  std::string tested(stream.str());
+  VERIFY( tested == expected );
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc
new file mode 100644
index 000000000..dcd3bd0b7
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/2.cc
@@ -0,0 +1,83 @@
+// 2005-01-17  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+
+#include <set>
+#include <testsuite_hooks.h>
+
+// A few tests for insert with hint, in the occasion of libstdc++/19422
+// and libstdc++/19433.
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  multiset<int> ms0, ms1;
+  multiset<int>::iterator iter1;
+  
+  ms0.insert(1);
+  ms1.insert(ms1.end(), 1);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(3);
+  ms1.insert(ms1.begin(), 3);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(4);
+  iter1 = ms1.insert(ms1.end(), 4);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(6);
+  ms1.insert(iter1, 6);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(2);
+  ms1.insert(ms1.begin(), 2);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(7);
+  ms1.insert(ms1.end(), 7);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(5);
+  ms1.insert(ms1.find(4), 5);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(0);
+  ms1.insert(ms1.end(), 0);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(8);
+  ms1.insert(ms1.find(3), 8);
+  VERIFY( ms0 == ms1 );
+  
+  ms0.insert(9);
+  ms1.insert(ms1.end(), 9);
+  VERIFY( ms0 == ms1 );
+
+  ms0.insert(10);
+  ms1.insert(ms1.begin(), 10);
+  VERIFY( ms0 == ms1 );
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc
new file mode 100644
index 000000000..3e6d92602
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/22102.cc
@@ -0,0 +1,140 @@
+// 2006-01-07  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2006, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 23.3.4  Class template multiset
+
+#include <set>
+#include <testsuite_hooks.h>
+
+// libstdc++/22102
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  typedef std::multiset<int>        Mset;
+  typedef Mset::value_type          value_type;
+  typedef Mset::iterator            iterator;
+  
+  Mset ms1;
+  
+  const iterator it1 = ms1.insert(value_type(0));
+  const iterator it2 = ms1.insert(value_type(1));  
+  const iterator it3 = ms1.insert(value_type(2));
+
+  const value_type vt1(2);
+  const iterator it4 = ms1.insert(it1, vt1);
+  iterator it5 = it4;
+  iterator it6 = it4;
+  VERIFY( ms1.size() == 4 );
+  VERIFY( *it4 == vt1 );
+  VERIFY( ++it5 == it3 );
+  VERIFY( --it6 == it2 );
+  VERIFY( *it5 == *it3 );
+  VERIFY( *it6 == *it2 );
+
+  const value_type vt2(2);
+  const iterator it7 = ms1.insert(ms1.begin(), vt2);
+  iterator it8 = it7;
+  iterator it9 = it7;
+  VERIFY( ms1.size() == 5 );
+  VERIFY( *it7 == vt2 );
+  VERIFY( ++it8 == it4 );
+  VERIFY( --it9 == it2 );
+  VERIFY( *it8 == *it4 );
+  VERIFY( *it9 == *it2 );
+
+  const value_type vt3(2);
+  const iterator it10 = ms1.insert(it1, vt3);
+  iterator it11 = it10;
+  iterator it12 = it10;
+  VERIFY( ms1.size() == 6 );
+  VERIFY( *it10 == vt3 );
+  VERIFY( ++it11 == it7 );
+  VERIFY( --it12 == it2 );
+  VERIFY( *it11 == *it7 );
+  VERIFY( *it12 == *it2 );
+
+  const value_type vt4(0);
+  const iterator it13 = ms1.insert(it10, vt4);
+  iterator it14 = it13;
+  iterator it15 = it13;
+  VERIFY( ms1.size() == 7 );
+  VERIFY( *it13 == vt4 );
+  VERIFY( ++it14 == it2 );
+  VERIFY( --it15 == it1 );
+  VERIFY( *it14 == *it2 );
+  VERIFY( *it15 == *it1 );
+
+  const value_type vt5(1);
+  const iterator it16 = ms1.insert(it13, vt5);
+  iterator it17 = it16;
+  iterator it18 = it16;
+  VERIFY( ms1.size() == 8 );
+  VERIFY( *it16 == vt5 );
+  VERIFY( ++it17 == it2 );
+  VERIFY( --it18 == it13 );
+  VERIFY( *it17 == *it2 );
+  VERIFY( *it18 == *it13 );
+
+  const value_type vt6(0);
+  const iterator it19 = ms1.insert(it1, vt6);
+  iterator it20 = it19;
+  VERIFY( ms1.size() == 9 );
+  VERIFY( *it19 == vt6 );
+  VERIFY( it19 == ms1.begin() );
+  VERIFY( ++it20 == it1 );
+  VERIFY( *it20 == *it1 );
+
+  const value_type vt7(3);
+  const iterator it21 = ms1.insert(it19, vt7);
+  iterator it22 = it21;
+  iterator it23 = it21;
+  VERIFY( ms1.size() == 10 );
+  VERIFY( *it21 == vt7 );
+  VERIFY( ++it22 == ms1.end() );
+  VERIFY( --it23 == it3 );
+  VERIFY( *it23 == *it3 );
+
+  const value_type vt8(2);
+  const iterator it24 = ms1.insert(ms1.end(), vt8);
+  iterator it25 = it24;
+  iterator it26 = it24;
+  VERIFY( ms1.size() == 11 );
+  VERIFY( *it24 == vt8 );
+  VERIFY( ++it25 == it21 );
+  VERIFY( --it26 == it3 );
+  VERIFY( *it25 == *it21 );
+  VERIFY( *it26 == *it3 );   
+    
+  const value_type vt9(3);
+  const iterator it27 = ms1.insert(it3, vt9);
+  iterator it28 = it27;
+  iterator it29 = it27;
+  VERIFY( ms1.size() == 12 );
+  VERIFY( *it27 == vt9 );
+  VERIFY( ++it28 == it21 );
+  VERIFY( --it29 == it24 );
+  VERIFY( *it28 == *it21 );
+  VERIFY( *it29 == *it24 ); 
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc
new file mode 100644
index 000000000..202d2eec0
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/3.cc
@@ -0,0 +1,69 @@
+// { dg-options "-std=gnu++0x" }
+
+// 2010-11-10  Paolo Carlini  <paolo.carlini@oracle.com> 
+//
+// Copyright (C) 2010 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <iterator>
+#include <set>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::multiset<rvalstruct> Set;
+  Set s;
+  VERIFY( s.empty() );
+
+  Set::iterator i = s.insert(rvalstruct(1));
+  VERIFY( s.size() == 1 );
+  VERIFY( std::distance(s.begin(), s.end()) == 1 );
+  VERIFY( i == s.begin() );
+  VERIFY( (*i).val == 1 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::multiset<rvalstruct> Set;
+  Set s;
+  VERIFY( s.empty() );
+
+  s.insert(rvalstruct(2));
+  Set::iterator i = s.insert(rvalstruct(2));
+  VERIFY( s.size() == 2 );
+  VERIFY( std::distance(s.begin(), s.end()) == 2 );
+  VERIFY( (*i).val == 2 );
+  
+  Set::iterator i2 = s.begin();
+  ++i2;
+  VERIFY( i == s.begin() || i == i2 );
+  VERIFY( (*(s.begin())).val == 2 && (*i2).val == 2 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc
new file mode 100644
index 000000000..eccf18f47
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/insert/4.cc
@@ -0,0 +1,69 @@
+// { dg-options "-std=gnu++0x" }
+
+// 2010-11-10  Paolo Carlini  <paolo.carlini@oracle.com> 
+//
+// Copyright (C) 2010 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <iterator>
+#include <set>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::multiset<rvalstruct> Set;
+  Set s;
+  VERIFY( s.empty() );
+
+  Set::iterator i = s.insert(s.begin(), rvalstruct(1));
+  VERIFY( s.size() == 1 );
+  VERIFY( std::distance(s.begin(), s.end()) == 1 );
+  VERIFY( i == s.begin() );
+  VERIFY( (*i).val == 1 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::multiset<rvalstruct> Set;
+  Set s;
+  VERIFY( s.empty() );
+
+  Set::iterator i0 = s.insert(s.begin(), rvalstruct(2));
+  Set::iterator i1 = s.insert(i0, rvalstruct(2));
+  VERIFY( s.size() == 2 );
+  VERIFY( std::distance(s.begin(), s.end()) == 2 );
+  VERIFY( (*i1).val == 2 );
+  
+  Set::iterator i2 = s.begin();
+  ++i2;
+  VERIFY( i1 == s.begin() );
+  VERIFY( (*(s.begin())).val == 2 && (*i2).val == 2 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc
new file mode 100644
index 000000000..f7d541deb
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/1.cc
@@ -0,0 +1,65 @@
+// Copyright (C) 2004, 2005, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+ 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+ 
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <set>
+#include <testsuite_hooks.h>
+ 
+struct T { int i; };
+
+// T must be LessThanComparable to pass concept-checks
+bool operator<(T l, T r) { return l.i < r.i; }
+
+int swap_calls;
+
+namespace std
+{
+  template<> 
+    void 
+    multiset<T>::swap(multiset<T>&) 
+    { ++swap_calls; }
+}
+
+// Should use multiset specialization for swap.
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  std::multiset<T> A;
+  std::multiset<T> B;
+  swap_calls = 0;
+  std::swap(A, B);
+  VERIFY(1 == swap_calls);
+}
+
+// Should use multiset specialization for swap.
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+  multiset<T> A;
+  multiset<T> B;
+  swap_calls = 0;
+  swap(A, B);
+  VERIFY(1 == swap_calls);
+}
+
+// See c++/13658 for background info.
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc
new file mode 100644
index 000000000..81cad5ba5
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/2.cc
@@ -0,0 +1,137 @@
+// 2005-12-20  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 23.3.4 multiset::swap
+
+#include <set>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+// uneq_allocator as a non-empty allocator.
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef __gnu_test::uneq_allocator<char> my_alloc;
+  typedef multiset<char, less<char>, my_alloc> my_multiset;
+
+  const char title01[] = "Rivers of sand";
+  const char title02[] = "Concret PH";
+  const char title03[] = "Sonatas and Interludes for Prepared Piano";
+  const char title04[] = "never as tired as when i'm waking up";
+
+  const size_t N1 = sizeof(title01);
+  const size_t N2 = sizeof(title02);
+  const size_t N3 = sizeof(title03);
+  const size_t N4 = sizeof(title04);
+
+  const multiset<char> mset01_ref(title01, title01 + N1);
+  const multiset<char> mset02_ref(title02, title02 + N2);
+  const multiset<char> mset03_ref(title03, title03 + N3);
+  const multiset<char> mset04_ref(title04, title04 + N4);
+
+  my_multiset::size_type size01, size02;
+
+  my_alloc alloc01(1);
+
+  my_multiset mset01(less<char>(), alloc01);
+  size01 = mset01.size();
+  my_multiset mset02(less<char>(), alloc01);
+  size02 = mset02.size();
+  
+  mset01.swap(mset02);
+  VERIFY( mset01.size() == size02 );
+  VERIFY( mset01.empty() );
+  VERIFY( mset02.size() == size01 );
+  VERIFY( mset02.empty() );
+
+  my_multiset mset03(less<char>(), alloc01);
+  size01 = mset03.size();
+  my_multiset mset04(title02, title02 + N2, less<char>(), alloc01);
+  size02 = mset04.size();
+  
+  mset03.swap(mset04);
+  VERIFY( mset03.size() == size02 );
+  VERIFY( equal(mset03.begin(), mset03.end(), mset02_ref.begin()) );
+  VERIFY( mset04.size() == size01 );
+  VERIFY( mset04.empty() );
+  
+  my_multiset mset05(title01, title01 + N1, less<char>(), alloc01);
+  size01 = mset05.size();
+  my_multiset mset06(title02, title02 + N2, less<char>(), alloc01);
+  size02 = mset06.size();
+  
+  mset05.swap(mset06);
+  VERIFY( mset05.size() == size02 );
+  VERIFY( equal(mset05.begin(), mset05.end(), mset02_ref.begin()) );
+  VERIFY( mset06.size() == size01 );
+  VERIFY( equal(mset06.begin(), mset06.end(), mset01_ref.begin()) );
+
+  my_multiset mset07(title01, title01 + N1, less<char>(), alloc01);
+  size01 = mset07.size();
+  my_multiset mset08(title03, title03 + N3, less<char>(), alloc01);
+  size02 = mset08.size();
+
+  mset07.swap(mset08);
+  VERIFY( mset07.size() == size02 );
+  VERIFY( equal(mset07.begin(), mset07.end(), mset03_ref.begin()) );
+  VERIFY( mset08.size() == size01 );
+  VERIFY( equal(mset08.begin(), mset08.end(), mset01_ref.begin()) );
+
+  my_multiset mset09(title03, title03 + N3, less<char>(), alloc01);
+  size01 = mset09.size();
+  my_multiset mset10(title04, title04 + N4, less<char>(), alloc01);
+  size02 = mset10.size();
+
+  mset09.swap(mset10);
+  VERIFY( mset09.size() == size02 );
+  VERIFY( equal(mset09.begin(), mset09.end(), mset04_ref.begin()) );
+  VERIFY( mset10.size() == size01 );
+  VERIFY( equal(mset10.begin(), mset10.end(), mset03_ref.begin()) );
+
+  my_multiset mset11(title04, title04 + N4, less<char>(), alloc01);
+  size01 = mset11.size();
+  my_multiset mset12(title01, title01 + N1, less<char>(), alloc01);
+  size02 = mset12.size();
+
+  mset11.swap(mset12);
+  VERIFY( mset11.size() == size02 );
+  VERIFY( equal(mset11.begin(), mset11.end(), mset01_ref.begin()) );
+  VERIFY( mset12.size() == size01 );
+  VERIFY( equal(mset12.begin(), mset12.end(), mset04_ref.begin()) );
+
+  my_multiset mset13(title03, title03 + N3, less<char>(), alloc01);
+  size01 = mset13.size();
+  my_multiset mset14(title03, title03 + N3, less<char>(), alloc01);
+  size02 = mset14.size();
+
+  mset13.swap(mset14);
+  VERIFY( mset13.size() == size02 );
+  VERIFY( equal(mset13.begin(), mset13.end(), mset03_ref.begin()) );
+  VERIFY( mset14.size() == size01 );
+  VERIFY( equal(mset14.begin(), mset14.end(), mset03_ref.begin()) );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc
new file mode 100644
index 000000000..0d99bfb42
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap/3.cc
@@ -0,0 +1,166 @@
+// 2005-12-20  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2009 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 23.3.4 multiset::swap
+
+#include <set>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+// uneq_allocator, two different personalities.
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef __gnu_test::uneq_allocator<char> my_alloc;
+  typedef multiset<char, less<char>, my_alloc> my_multiset;
+
+  const char title01[] = "Rivers of sand";
+  const char title02[] = "Concret PH";
+  const char title03[] = "Sonatas and Interludes for Prepared Piano";
+  const char title04[] = "never as tired as when i'm waking up";
+
+  const size_t N1 = sizeof(title01);
+  const size_t N2 = sizeof(title02);
+  const size_t N3 = sizeof(title03);
+  const size_t N4 = sizeof(title04);
+
+  const multiset<char> mset01_ref(title01, title01 + N1);
+  const multiset<char> mset02_ref(title02, title02 + N2);
+  const multiset<char> mset03_ref(title03, title03 + N3);
+  const multiset<char> mset04_ref(title04, title04 + N4);
+
+  my_multiset::size_type size01, size02;
+
+  my_alloc alloc01(1), alloc02(2);
+  int personality01, personality02;
+
+  my_multiset mset01(less<char>(), alloc01);
+  size01 = mset01.size();
+  personality01 = mset01.get_allocator().get_personality();
+  my_multiset mset02(less<char>(), alloc02);
+  size02 = mset02.size();
+  personality02 = mset02.get_allocator().get_personality();
+
+  mset01.swap(mset02);
+  VERIFY( mset01.size() == size02 );
+  VERIFY( mset01.empty() );
+  VERIFY( mset02.size() == size01 );
+  VERIFY( mset02.empty() );
+  VERIFY( mset01.get_allocator().get_personality() == personality02 );
+  VERIFY( mset02.get_allocator().get_personality() == personality01 );
+
+  my_multiset mset03(less<char>(), alloc02);
+  size01 = mset03.size();
+  personality01 = mset03.get_allocator().get_personality();
+  my_multiset mset04(title02, title02 + N2, less<char>(), alloc01);
+  size02 = mset04.size();
+  personality02 = mset04.get_allocator().get_personality();
+
+  mset03.swap(mset04);
+  VERIFY( mset03.size() == size02 );
+  VERIFY( equal(mset03.begin(), mset03.end(), mset02_ref.begin()) );
+  VERIFY( mset04.size() == size01 );
+  VERIFY( mset04.empty() );
+  VERIFY( mset03.get_allocator().get_personality() == personality02 );
+  VERIFY( mset04.get_allocator().get_personality() == personality01 );
+  
+  my_multiset mset05(title01, title01 + N1, less<char>(), alloc01);
+  size01 = mset05.size();
+  personality01 = mset05.get_allocator().get_personality();
+  my_multiset mset06(title02, title02 + N2, less<char>(), alloc02);
+  size02 = mset06.size();
+  personality02 = mset06.get_allocator().get_personality();
+
+  mset05.swap(mset06);
+  VERIFY( mset05.size() == size02 );
+  VERIFY( equal(mset05.begin(), mset05.end(), mset02_ref.begin()) );
+  VERIFY( mset06.size() == size01 );
+  VERIFY( equal(mset06.begin(), mset06.end(), mset01_ref.begin()) );
+  VERIFY( mset05.get_allocator().get_personality() == personality02 );
+  VERIFY( mset06.get_allocator().get_personality() == personality01 );
+
+  my_multiset mset07(title01, title01 + N1, less<char>(), alloc02);
+  size01 = mset07.size();
+  personality01 = mset07.get_allocator().get_personality();
+  my_multiset mset08(title03, title03 + N3, less<char>(), alloc01);
+  size02 = mset08.size();
+  personality02 = mset08.get_allocator().get_personality();
+
+  mset07.swap(mset08);
+  VERIFY( mset07.size() == size02 );
+  VERIFY( equal(mset07.begin(), mset07.end(), mset03_ref.begin()) );
+  VERIFY( mset08.size() == size01 );
+  VERIFY( equal(mset08.begin(), mset08.end(), mset01_ref.begin()) );
+  VERIFY( mset07.get_allocator().get_personality() == personality02 );
+  VERIFY( mset08.get_allocator().get_personality() == personality01 );
+
+  my_multiset mset09(title03, title03 + N3, less<char>(), alloc01);
+  size01 = mset09.size();
+  personality01 = mset09.get_allocator().get_personality();
+  my_multiset mset10(title04, title04 + N4, less<char>(), alloc02);
+  size02 = mset10.size();
+  personality02 = mset10.get_allocator().get_personality();
+
+  mset09.swap(mset10);
+  VERIFY( mset09.size() == size02 );
+  VERIFY( equal(mset09.begin(), mset09.end(), mset04_ref.begin()) );
+  VERIFY( mset10.size() == size01 );
+  VERIFY( equal(mset10.begin(), mset10.end(), mset03_ref.begin()) );
+  VERIFY( mset09.get_allocator().get_personality() == personality02 );
+  VERIFY( mset10.get_allocator().get_personality() == personality01 );
+
+  my_multiset mset11(title04, title04 + N4, less<char>(), alloc02);
+  size01 = mset11.size();
+  personality01 = mset11.get_allocator().get_personality();
+  my_multiset mset12(title01, title01 + N1, less<char>(), alloc01);
+  size02 = mset12.size();
+  personality02 = mset12.get_allocator().get_personality();
+
+  mset11.swap(mset12);
+  VERIFY( mset11.size() == size02 );
+  VERIFY( equal(mset11.begin(), mset11.end(), mset01_ref.begin()) );
+  VERIFY( mset12.size() == size01 );
+  VERIFY( equal(mset12.begin(), mset12.end(), mset04_ref.begin()) );
+  VERIFY( mset11.get_allocator().get_personality() == personality02 );
+  VERIFY( mset12.get_allocator().get_personality() == personality01 );
+
+  my_multiset mset13(title03, title03 + N3, less<char>(), alloc01);
+  size01 = mset13.size();
+  personality01 = mset13.get_allocator().get_personality();
+  my_multiset mset14(title03, title03 + N3, less<char>(), alloc02);
+  size02 = mset14.size();
+  personality02 = mset14.get_allocator().get_personality();
+
+  mset13.swap(mset14);
+  VERIFY( mset13.size() == size02 );
+  VERIFY( equal(mset13.begin(), mset13.end(), mset03_ref.begin()) );
+  VERIFY( mset14.size() == size01 );
+  VERIFY( equal(mset14.begin(), mset14.end(), mset03_ref.begin()) );
+  VERIFY( mset13.get_allocator().get_personality() == personality02 );
+  VERIFY( mset14.get_allocator().get_personality() == personality01 );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}