diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2012-04-11 11:27:50 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2012-04-11 11:27:50 +0000 |
| commit | b16212bd3c3ecd421c09c3a632b43ec68674b6bf (patch) | |
| tree | 45ce3b792680eac55a3a1dfbe1e7257ac5d7704f /libstdc++-v3 | |
| parent | 32ed5fcc3a447b2c0af09658f3c474d30cff2f00 (diff) | |
| download | gcc-b16212bd3c3ecd421c09c3a632b43ec68674b6bf.zip gcc-b16212bd3c3ecd421c09c3a632b43ec68674b6bf.tar.gz gcc-b16212bd3c3ecd421c09c3a632b43ec68674b6bf.tar.bz2 | |
re PR libstdc++/52931 (std::hash shouldn't be defined for unknown types)
2012-04-11 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/52931
* include/bits/functional_hash.h (struct hash): Remove definition.
* testsuite/20_util/hash/52931.cc: New.
From-SVN: r186310
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/functional_hash.h | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/hash/52931.cc | 32 |
3 files changed, 41 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba608fe..de08098 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-04-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/52931 + * include/bits/functional_hash.h (struct hash): Remove definition. + * testsuite/20_util/hash/52931.cc: New. + 2012-04-11 Manuel López-Ibáñez <manu@gcc.gnu.org> PR 24985 diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h index e892159..69c186c 100644 --- a/libstdc++-v3/include/bits/functional_hash.h +++ b/libstdc++-v3/include/bits/functional_hash.h @@ -1,6 +1,7 @@ // functional_hash.h header -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 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 @@ -55,12 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Primary class template hash. template<typename _Tp> - struct hash : public __hash_base<size_t, _Tp> - { - static_assert(sizeof(_Tp) < 0, - "std::hash is not specialized for this type"); - size_t operator()(const _Tp&) const noexcept; - }; + struct hash; /// Partial specializations for pointer types. template<typename _Tp> diff --git a/libstdc++-v3/testsuite/20_util/hash/52931.cc b/libstdc++-v3/testsuite/20_util/hash/52931.cc new file mode 100644 index 0000000..f30a3e7 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/hash/52931.cc @@ -0,0 +1,32 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// 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 <type_traits> +#include <functional> + +class S{}; // No hash specialization + +template<class T> +auto f(int) -> decltype(std::hash<T>(), std::true_type()); + +template<class T> +auto f(...) -> decltype(std::false_type()); + +static_assert(!decltype(f<S>(0))::value, ""); |