re PR libstdc++/33807 (Incorrect ambiguous overload)

2007-10-18  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/33807
	* include/bits/allocator.h (operator==(const allocator<_Tp>&,
	const allocator<_Tp>&), operator!=(const allocator<_Tp>&,
	const allocator<_Tp>&)): Add.
	* testsuite/20_util/memory/allocator/33807.cc: New.

From-SVN: r129454

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8169fa02b5fde92b787298cca3ccd909a73683b3..a8b8e3eb76d6b0d53e305c3014369bb194c0b6df 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-18  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/33807
+       * include/bits/allocator.h (operator==(const allocator<_Tp>&,
+       const allocator<_Tp>&), operator!=(const allocator<_Tp>&,
+       const allocator<_Tp>&)): Add.
+       * testsuite/20_util/memory/allocator/33807.cc: New.
+       
 2007-10-14  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * docs/html/Makefile: Follow up to libstdc++/14991, remove target.

diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index 43939c14fa763e2adf7df131312c1d3a94d1c5c7..4d62c0ae8f320e6c13dda1ce9bd3be6f7802235e 100644 (file)
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -115,11 +115,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     operator==(const allocator<_T1>&, const allocator<_T2>&)
     { return true; }
 
+  template<typename _Tp>
+    inline bool
+    operator==(const allocator<_Tp>&, const allocator<_Tp>&)
+    { return true; }
+
   template<typename _T1, typename _T2>
     inline bool
     operator!=(const allocator<_T1>&, const allocator<_T2>&)
     { return false; }
 
+  template<typename _Tp>
+    inline bool
+    operator!=(const allocator<_Tp>&, const allocator<_Tp>&)
+    { return false; }
+
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.
   // NB: This syntax is a GNU extension.

diff --git a/libstdc++-v3/testsuite/20_util/memory/allocator/33807.cc b/libstdc++-v3/testsuite/20_util/memory/allocator/33807.cc
new file mode 100644 (file)
index 0000000..7d9c9ba
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/memory/allocator/33807.cc
@@ -0,0 +1,33 @@
+// { dg-do compile }
+
+// Copyright (C) 2007 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+#include <list>
+
+// libstdc++/33807
+template <class T>
+bool operator != (const T& x, const T& y) { return !(x == y); }
+
+struct foo { };
+
+void fnx()
+{
+  std::list<foo> l1, l2;
+  l1 = l2;
+}