2010-03-25 Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/unordered_map.h (operator==, operator!=): Add per N3068.
	* include/bits/unordered_set.h (operator==, operator!=): Likewise.
	* include/debug/unordered_map (operator==, operator!=): Likewise.
	* include/debug/unordered_set: Likewise.
	* include/profile/unordered_map: Likewise.
	* include/profile/unordered_set: Likewise.
	* testsuite/23_containers/unordered_map/operators/1.cc: New.
	* testsuite/23_containers/unordered_multimap/operators/1.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/operators/2.cc: Likewise.
	* testsuite/23_containers/unordered_set/operators/1.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/operators/1.cc: Likewise.

2010-03-25  John Lakos  <jlakos@bloomberg.net>
	    Pablo Halpern  <phalpern@halpernwightsoftware.com>
	    Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/hashtable_policy.h (struct _Equality_base): Add.
	* include/bits/hashtable.h (_Hashtable<>): Derive from the latter.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157736 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 63 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc
new file mode 100644
index 00000000000..1121dbc5200
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/operators/2.cc
@@ -0,0 +1,63 @@
+// { dg-options "-std=gnu++0x" }
+
+// 2010-03-25  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 <unordered_map>
+#include <algorithm>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef std::pair<const int, int> Pair;
+  std::unordered_multimap<int, int> umm1, umm2;
+  VERIFY( umm1 == umm2 );
+  VERIFY( !(umm1 != umm2) );
+
+  int second1[] = { -1, -2, -3, -4, -5 };
+  int second2[] = { -1, -2, -3, -4, -5 };
+  const unsigned size = sizeof(second1) / sizeof(int);
+
+  for (unsigned perm1 = 0; perm1 < 120; ++perm1)
+    {
+      umm1.clear();
+      std::next_permutation(second1, second1 + size);
+      for (unsigned i1 = 0; i1 < size; ++i1)
+	umm1.insert(Pair(0, second1[i1]));
+
+      for (unsigned perm2 = 0; perm2 < 120; ++perm2)
+	{
+	  umm2.clear();
+	  std::next_permutation(second2, second2 + size);
+	  for (unsigned i2 = 0; i2 < size; ++i2)
+	    umm2.insert(Pair(0, second2[i2]));
+
+	  VERIFY( umm1 == umm2 );
+	  VERIFY( !(umm1 != umm2) );
+	}
+    }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}