diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-10-18 10:00:18 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-10-18 10:00:18 +0000 |
| commit | 741e7594bec656ff6a5bc2e7e83655e86880e868 (patch) | |
| tree | 1aab13107ddfb27c9b6dbc6dcdd400f3e4724a30 | |
| parent | 254f522229578af1af093b2e4b6f1a0cc400d216 (diff) | |
| download | gcc-741e7594bec656ff6a5bc2e7e83655e86880e868.zip gcc-741e7594bec656ff6a5bc2e7e83655e86880e868.tar.gz gcc-741e7594bec656ff6a5bc2e7e83655e86880e868.tar.bz2 | |
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/allocator/33807.cc: New.
From-SVN: r129434
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/allocator.h | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/allocator/33807.cc | 33 |
3 files changed, 51 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 91db12e..7fb26d3 100644 --- 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/allocator/33807.cc: New. + 2007-10-17 Paolo Carlini <pcarlini@suse.de> * include/bits/cpp_type_traits.h (__is_byte): Add. diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index e233430..8699fc8 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -113,11 +113,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/allocator/33807.cc b/libstdc++-v3/testsuite/20_util/allocator/33807.cc new file mode 100644 index 0000000..7d9c9ba --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/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; +} |