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.

11 files changed, 872 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc
new file mode 100644
index 000000000..6c61b9430
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/47628.cc
@@ -0,0 +1,46 @@
+// 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 }
+
+#include <map>
+
+struct Key
+{
+  Key() { }
+
+  Key(const Key&) { }
+
+  template<typename T>
+    Key(const T&)
+    { }
+
+  bool operator<(const Key&) const;
+};
+
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+// libstdc++/47628
+void f()
+{
+  typedef std::map<Key, int> Map;
+  Map m;
+  m.insert(Map::value_type());
+  Map::iterator i = m.begin();
+  m.erase(i);
+}
+#endif
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/51142.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/erase/51142.cc
new file mode 100644
index 000000000..f50b7b7e9
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/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 <map>
+
+struct X
+{
+  template<typename T>
+  X(T&) {}
+};
+
+bool operator<(const X&, const X&) { return false; }
+
+// LWG 2059.
+void erasor(std::map<X, int>& s, X x)
+{
+  std::map<X, int>::iterator it = s.find(x);
+  if (it != s.end())
+    s.erase(it);
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc
new file mode 100644
index 000000000..037e00a68
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/1.cc
@@ -0,0 +1,67 @@
+// 2001-08-23 pme & Sylvain.Pion@sophia.inria.fr
+
+// Copyright (C) 2001, 2003, 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.1.2, table 69 -- map::insert(p,t)
+
+#include <map>
+#include <testsuite_hooks.h>
+
+// { dg-do run }
+
+// libstdc++/3349 and
+// http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01375.html
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  typedef std::map<int, int>   Map;
+  Map             M;
+  Map::iterator   hint;
+
+  hint = M.insert(Map::value_type(7, 0)).first;
+
+  M.insert(hint, Map::value_type(8, 1));
+  M.insert(M.begin(), Map::value_type(9, 2));
+
+#if 0
+  // The tree's __rb_verify() member must be exposed in map<> before this
+  // will even compile.  It's good test to see that "missing" entries are
+  // in fact present in the {map,tree}, but in the wrong place.
+  if (0)
+  {
+      Map::iterator  i = M.begin();
+      while (i != M.end()) {
+          std::cerr << '(' << i->first << ',' << i->second << ")\n";
+          ++i;
+      }
+      std::cerr << "tree internal verify: "
+                << std::boolalpha << M.__rb_verify() << "\n";
+  }
+#endif
+
+  VERIFY ( M.find(7) != M.end() );
+  VERIFY ( M.find(8) != M.end() );
+  VERIFY ( M.find(9) != M.end() );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
+
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc
new file mode 100644
index 000000000..eab015380
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/16813.cc
@@ -0,0 +1,41 @@
+// Copyright (C) 2004, 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/>.
+
+#include <debug/map>
+#include <testsuite_hooks.h>
+
+// libstdc++/16813
+void test01()
+{
+  using __gnu_debug::map;
+  bool test __attribute__((unused)) = true;
+
+  map<int, float> m1, m2;
+
+  m1[3] = 3.0f;
+  m1[11] = -67.0f;
+
+  m2.insert(m1.begin(), m1.end());
+
+  VERIFY( m1 == m2 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc
new file mode 100644
index 000000000..5de89de54
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/2.cc
@@ -0,0 +1,74 @@
+// { 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 <map>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<int, rvalstruct> Map;
+  typedef std::pair<const int, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty());
+
+  std::pair<Map::iterator, bool> p = m.insert(Pair(1, rvalstruct(3)));
+  VERIFY( p.second );
+  VERIFY( m.size() == 1 );
+  VERIFY( std::distance(m.begin(), m.end()) == 1 );
+  VERIFY( p.first == m.begin() );
+  VERIFY( p.first->first == 1 );
+  VERIFY( (p.first->second).val == 3 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<int, rvalstruct> Map;
+  typedef std::pair<const int, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty() );
+
+  std::pair<Map::iterator, bool> p1 = m.insert(Pair(2, rvalstruct(3)));
+  std::pair<Map::iterator, bool> p2 = m.insert(Pair(2, rvalstruct(7)));
+
+  VERIFY( p1.second );
+  VERIFY( !p2.second );
+  VERIFY( m.size() == 1 );
+  VERIFY( p1.first == p2.first );
+  VERIFY( p1.first->first == 2 );
+  VERIFY( (p2.first->second).val == 3 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc
new file mode 100644
index 000000000..e5827bfb3
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/3.cc
@@ -0,0 +1,77 @@
+// { 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 <map>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<rvalstruct, rvalstruct> Map;
+  typedef std::pair<rvalstruct, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty());
+
+  std::pair<Map::iterator, bool> p = m.insert(Pair(rvalstruct(1),
+						   rvalstruct(3)));
+  VERIFY( p.second );
+  VERIFY( m.size() == 1 );
+  VERIFY( std::distance(m.begin(), m.end()) == 1 );
+  VERIFY( p.first == m.begin() );
+  VERIFY( (p.first->first).val == 1 );
+  VERIFY( (p.first->second).val == 3 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<rvalstruct, rvalstruct> Map;
+  typedef std::pair<rvalstruct, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty() );
+
+  std::pair<Map::iterator, bool> p1 = m.insert(Pair(rvalstruct(2),
+						    rvalstruct(3)));
+  std::pair<Map::iterator, bool> p2 = m.insert(Pair(rvalstruct(2),
+						    rvalstruct(7)));
+
+  VERIFY( p1.second );
+  VERIFY( !p2.second );
+  VERIFY( m.size() == 1 );
+  VERIFY( p1.first == p2.first );
+  VERIFY( (p1.first->first).val == 2 );
+  VERIFY( (p2.first->second).val == 3 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc
new file mode 100644
index 000000000..28eba6472
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/4.cc
@@ -0,0 +1,70 @@
+// { 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 <map>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<int, rvalstruct> Map;
+  typedef std::pair<const int, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty());
+
+  Map::iterator p = m.insert(m.begin(), Pair(1, rvalstruct(3)));
+  VERIFY( m.size() == 1 );
+  VERIFY( std::distance(m.begin(), m.end()) == 1 );
+  VERIFY( p == m.begin() );
+  VERIFY( p->first == 1 );
+  VERIFY( (p->second).val == 3 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<int, rvalstruct> Map;
+  typedef std::pair<const int, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty() );
+
+  Map::iterator p1 = m.insert(m.begin(), Pair(2, rvalstruct(3)));
+  Map::iterator p2 = m.insert(p1, Pair(2, rvalstruct(7)));
+  VERIFY( m.size() == 1 );
+  VERIFY( p1 == p2 );
+  VERIFY( p1->first == 2 );
+  VERIFY( (p2->second).val == 3 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc
new file mode 100644
index 000000000..3dc153b85
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/insert/5.cc
@@ -0,0 +1,73 @@
+// { 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 <map>
+#include <testsuite_hooks.h>
+#include <testsuite_rvalref.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<rvalstruct, rvalstruct> Map;
+  typedef std::pair<rvalstruct, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty());
+
+  Map::iterator p = m.insert(m.begin(), Pair(rvalstruct(1),
+					     rvalstruct(3)));
+  VERIFY( m.size() == 1 );
+  VERIFY( std::distance(m.begin(), m.end()) == 1 );
+  VERIFY( p == m.begin() );
+  VERIFY( (p->first).val == 1 );
+  VERIFY( (p->second).val == 3 );
+}
+
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::rvalstruct;
+
+  typedef std::map<rvalstruct, rvalstruct> Map;
+  typedef std::pair<rvalstruct, rvalstruct> Pair;
+
+  Map m;
+  VERIFY( m.empty() );
+
+  Map::iterator p1 = m.insert(m.begin(), Pair(rvalstruct(2),
+					      rvalstruct(3)));
+  Map::iterator p2 = m.insert(p1, Pair(rvalstruct(2),
+				       rvalstruct(7)));
+  VERIFY( m.size() == 1 );
+  VERIFY( p1 == p2 );
+  VERIFY( (p1->first).val == 2 );
+  VERIFY( (p2->second).val == 3 );
+}
+
+int main()
+{
+  test01();
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/1.cc
new file mode 100644
index 000000000..b5fe2e374
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/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 <map>
+#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 
+    map<T, int>::swap(map<T, int>&) 
+    { ++swap_calls; }
+}
+
+// Should use map specialization for swap.
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  std::map<T, int> A;
+  std::map<T, int> B;
+  swap_calls = 0;
+  std::swap(A, B);
+  VERIFY(1 == swap_calls);
+}
+
+// Should use map specialization for swap.
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+  map<T, int> A;
+  map<T, int> 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/map/modifiers/swap/2.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc
new file mode 100644
index 000000000..741276b83
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/2.cc
@@ -0,0 +1,146 @@
+// 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.1 map::swap
+
+#include <map>
+#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 pair<const char, int> my_pair;
+  typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
+  typedef map<char, int, less<char>, my_alloc> my_map;
+
+  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);
+
+  map<char, int> map01_ref;
+  for (size_t i = 0; i < N1; ++i)
+    map01_ref.insert(my_pair(title01[i], i));
+  map<char, int> map02_ref;
+  for (size_t i = 0; i < N2; ++i)
+    map02_ref.insert(my_pair(title02[i], i));
+  map<char, int> map03_ref;
+  for (size_t i = 0; i < N3; ++i)
+    map03_ref.insert(my_pair(title03[i], i));
+  map<char, int> map04_ref;
+  for (size_t i = 0; i < N4; ++i)
+    map04_ref.insert(my_pair(title04[i], i));
+
+  my_map::size_type size01, size02;
+
+  my_alloc alloc01(1);
+
+  my_map map01(less<char>(), alloc01);
+  size01 = map01.size();
+  my_map map02(less<char>(), alloc01);
+  size02 = map02.size();
+  
+  map01.swap(map02);
+  VERIFY( map01.size() == size02 );
+  VERIFY( map01.empty() );
+  VERIFY( map02.size() == size01 );
+  VERIFY( map02.empty() );
+
+  my_map map03(less<char>(), alloc01);
+  size01 = map03.size();
+  my_map map04(map02_ref.begin(), map02_ref.end(), less<char>(), alloc01);
+  size02 = map04.size();
+
+  map03.swap(map04);
+  VERIFY( map03.size() == size02 );
+  VERIFY( equal(map03.begin(), map03.end(), map02_ref.begin()) );
+  VERIFY( map04.size() == size01 );
+  VERIFY( map04.empty() );
+  
+  my_map map05(map01_ref.begin(), map01_ref.end(), less<char>(), alloc01);
+  size01 = map05.size();
+  my_map map06(map02_ref.begin(), map02_ref.end(), less<char>(), alloc01);
+  size02 = map06.size();
+
+  map05.swap(map06);
+  VERIFY( map05.size() == size02 );
+  VERIFY( equal(map05.begin(), map05.end(), map02_ref.begin()) );
+  VERIFY( map06.size() == size01 );
+  VERIFY( equal(map06.begin(), map06.end(), map01_ref.begin()) );
+
+  my_map map07(map01_ref.begin(), map01_ref.end(), less<char>(), alloc01);
+  size01 = map07.size();
+  my_map map08(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size02 = map08.size();
+
+  map07.swap(map08);
+  VERIFY( map07.size() == size02 );
+  VERIFY( equal(map07.begin(), map07.end(), map03_ref.begin()) );
+  VERIFY( map08.size() == size01 );
+  VERIFY( equal(map08.begin(), map08.end(), map01_ref.begin()) );
+
+  my_map map09(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size01 = map09.size();
+  my_map map10(map04_ref.begin(), map04_ref.end(), less<char>(), alloc01);
+  size02 = map10.size();
+
+  map09.swap(map10);
+  VERIFY( map09.size() == size02 );
+  VERIFY( equal(map09.begin(), map09.end(), map04_ref.begin()) );
+  VERIFY( map10.size() == size01 );
+  VERIFY( equal(map10.begin(), map10.end(), map03_ref.begin()) );
+
+  my_map map11(map04_ref.begin(), map04_ref.end(), less<char>(), alloc01);
+  size01 = map11.size();
+  my_map map12(map01_ref.begin(), map01_ref.end(), less<char>(), alloc01);
+  size02 = map12.size();
+
+  map11.swap(map12);
+  VERIFY( map11.size() == size02 );
+  VERIFY( equal(map11.begin(), map11.end(), map01_ref.begin()) );
+  VERIFY( map12.size() == size01 );
+  VERIFY( equal(map12.begin(), map12.end(), map04_ref.begin()) );
+
+  my_map map13(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size01 = map13.size();
+  my_map map14(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size02 = map14.size();
+
+  map13.swap(map14);
+  VERIFY( map13.size() == size02 );
+  VERIFY( equal(map13.begin(), map13.end(), map03_ref.begin()) );
+  VERIFY( map14.size() == size01 );
+  VERIFY( equal(map14.begin(), map14.end(), map03_ref.begin()) );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc
new file mode 100644
index 000000000..68980e463
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map/modifiers/swap/3.cc
@@ -0,0 +1,175 @@
+// 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.1 map::swap
+
+#include <map>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+// uneq_allocator, two different personalities.
+void
+test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+
+  typedef pair<const char, int> my_pair;
+  typedef __gnu_test::uneq_allocator<my_pair> my_alloc;
+  typedef map<char, int, less<char>, my_alloc> my_map;
+
+  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);
+
+  map<char, int> map01_ref;
+  for (size_t i = 0; i < N1; ++i)
+    map01_ref.insert(my_pair(title01[i], i));
+  map<char, int> map02_ref;
+  for (size_t i = 0; i < N2; ++i)
+    map02_ref.insert(my_pair(title02[i], i));
+  map<char, int> map03_ref;
+  for (size_t i = 0; i < N3; ++i)
+    map03_ref.insert(my_pair(title03[i], i));
+  map<char, int> map04_ref;
+  for (size_t i = 0; i < N4; ++i)
+    map04_ref.insert(my_pair(title04[i], i));
+
+  my_map::size_type size01, size02;
+
+  my_alloc alloc01(1), alloc02(2);
+  int personality01, personality02;
+
+  my_map map01(less<char>(), alloc01);
+  size01 = map01.size();
+  personality01 = map01.get_allocator().get_personality();
+  my_map map02(less<char>(), alloc02);
+  size02 = map02.size();
+  personality02 = map02.get_allocator().get_personality();
+
+  map01.swap(map02);
+  VERIFY( map01.size() == size02 );
+  VERIFY( map01.empty() );
+  VERIFY( map02.size() == size01 );
+  VERIFY( map02.empty() );
+  VERIFY( map01.get_allocator().get_personality() == personality02 );
+  VERIFY( map02.get_allocator().get_personality() == personality01 );
+
+  my_map map03(less<char>(), alloc02);
+  size01 = map03.size();
+  personality01 = map03.get_allocator().get_personality();
+  my_map map04(map02_ref.begin(), map02_ref.end(), less<char>(), alloc01);
+  size02 = map04.size();
+  personality02 = map04.get_allocator().get_personality();
+
+  map03.swap(map04);
+  VERIFY( map03.size() == size02 );
+  VERIFY( equal(map03.begin(), map03.end(), map02_ref.begin()) );
+  VERIFY( map04.size() == size01 );
+  VERIFY( map04.empty() );
+  VERIFY( map03.get_allocator().get_personality() == personality02 );
+  VERIFY( map04.get_allocator().get_personality() == personality01 );
+  
+  my_map map05(map01_ref.begin(), map01_ref.end(), less<char>(), alloc01);
+  size01 = map05.size();
+  personality01 = map05.get_allocator().get_personality();
+  my_map map06(map02_ref.begin(), map02_ref.end(), less<char>(), alloc02);
+  size02 = map06.size();
+  personality02 = map06.get_allocator().get_personality();
+
+  map05.swap(map06);
+  VERIFY( map05.size() == size02 );
+  VERIFY( equal(map05.begin(), map05.end(), map02_ref.begin()) );
+  VERIFY( map06.size() == size01 );
+  VERIFY( equal(map06.begin(), map06.end(), map01_ref.begin()) );
+  VERIFY( map05.get_allocator().get_personality() == personality02 );
+  VERIFY( map06.get_allocator().get_personality() == personality01 );
+
+  my_map map07(map01_ref.begin(), map01_ref.end(), less<char>(), alloc02);
+  size01 = map07.size();
+  personality01 = map07.get_allocator().get_personality();
+  my_map map08(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size02 = map08.size();
+  personality02 = map08.get_allocator().get_personality();
+
+  map07.swap(map08);
+  VERIFY( map07.size() == size02 );
+  VERIFY( equal(map07.begin(), map07.end(), map03_ref.begin()) );
+  VERIFY( map08.size() == size01 );
+  VERIFY( equal(map08.begin(), map08.end(), map01_ref.begin()) );
+  VERIFY( map07.get_allocator().get_personality() == personality02 );
+  VERIFY( map08.get_allocator().get_personality() == personality01 );
+
+  my_map map09(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size01 = map09.size();
+  personality01 = map09.get_allocator().get_personality();
+  my_map map10(map04_ref.begin(), map04_ref.end(), less<char>(), alloc02);
+  size02 = map10.size();
+  personality02 = map10.get_allocator().get_personality();
+
+  map09.swap(map10);
+  VERIFY( map09.size() == size02 );
+  VERIFY( equal(map09.begin(), map09.end(), map04_ref.begin()) );
+  VERIFY( map10.size() == size01 );
+  VERIFY( equal(map10.begin(), map10.end(), map03_ref.begin()) );
+  VERIFY( map09.get_allocator().get_personality() == personality02 );
+  VERIFY( map10.get_allocator().get_personality() == personality01 );
+
+  my_map map11(map04_ref.begin(), map04_ref.end(), less<char>(), alloc02);
+  size01 = map11.size();
+  personality01 = map11.get_allocator().get_personality();
+  my_map map12(map01_ref.begin(), map01_ref.end(), less<char>(), alloc01);
+  size02 = map12.size();
+  personality02 = map12.get_allocator().get_personality();
+
+  map11.swap(map12);
+  VERIFY( map11.size() == size02 );
+  VERIFY( equal(map11.begin(), map11.end(), map01_ref.begin()) );
+  VERIFY( map12.size() == size01 );
+  VERIFY( equal(map12.begin(), map12.end(), map04_ref.begin()) );
+  VERIFY( map11.get_allocator().get_personality() == personality02 );
+  VERIFY( map12.get_allocator().get_personality() == personality01 );
+
+  my_map map13(map03_ref.begin(), map03_ref.end(), less<char>(), alloc01);
+  size01 = map13.size();
+  personality01 = map13.get_allocator().get_personality();
+  my_map map14(map03_ref.begin(), map03_ref.end(), less<char>(), alloc02);
+  size02 = map14.size();
+  personality02 = map14.get_allocator().get_personality();
+
+  map13.swap(map14);
+  VERIFY( map13.size() == size02 );
+  VERIFY( equal(map13.begin(), map13.end(), map03_ref.begin()) );
+  VERIFY( map14.size() == size01 );
+  VERIFY( equal(map14.begin(), map14.end(), map03_ref.begin()) );
+  VERIFY( map13.get_allocator().get_personality() == personality02 );
+  VERIFY( map14.get_allocator().get_personality() == personality01 );
+}
+
+int main()
+{ 
+  test01();
+  return 0;
+}