[v3] libstdc++/52309

[Paolo Carlini]

Hi,

this is what I'm going to apply. Seems straightforward enough to go in now.

Tested x86_64-linux.

Thanks,
Paolo.

///////////////////

2012-02-19  Paolo Carlini  <paolo.carl...@oracle.com>

        PR libstdc++/52309
        * include/bits/hashtable_policy.h (_Equality_base<, true,>::
        _M_equal(const _Hashtable&)): Compare values with operator==.
        * testsuite/23_containers/unordered_set/operators/52309.cc: New.


Index: include/bits/hashtable_policy.h
===================================================================
--- include/bits/hashtable_policy.h     (revision 184380)
+++ include/bits/hashtable_policy.h     (working copy)
@@ -1113,7 +1113,7 @@
       for (auto __itx = __this->begin(); __itx != __this->end(); ++__itx)
        {
          const auto __ity = __other.find(_ExtractKey()(*__itx));
-         if (__ity == __other.end() || *__ity != *__itx)
+         if (__ity == __other.end() || !(*__ity == *__itx))
            return false;
        }
       return true;
Index: testsuite/23_containers/unordered_set/operators/52309.cc
===================================================================
--- testsuite/23_containers/unordered_set/operators/52309.cc    (revision 0)
+++ testsuite/23_containers/unordered_set/operators/52309.cc    (revision 0)
@@ -0,0 +1,28 @@
+// { dg-do compile }
+// { dg-options "-std=gnu++0x" }
+
+// Copyright (C) 2012 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_set>
+
+// libstdc++/52309
+struct value {};
+struct hash { std::size_t operator()(const value&) const; };
+bool operator==(value const&, value const&);
+std::unordered_set<value, hash> set;
+bool z = (set == set);