re PR libstdc++/56267 (unordered containers require Assignable hash function)
PR libstdc++/56267 * include/bits/hashtable.h (__cache_default): Check if hash function is copy assignable. * testsuite/23_containers/unordered_set/56267.cc: New. * testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust dg-error line number. * testsuite/23_containers/unordered_set/ not_default_constructible_hash_neg.cc: Likewise. From-SVN: r195936
This commit is contained in:
parent
a9b68b8289
commit
dfed5434f3
|
@ -1,5 +1,14 @@
|
||||||
2013-02-10 Jonathan Wakely <jwakely.gcc@gmail.com>
|
2013-02-10 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/56267
|
||||||
|
* include/bits/hashtable.h (__cache_default): Check if hash function
|
||||||
|
is copy assignable.
|
||||||
|
* testsuite/23_containers/unordered_set/56267.cc: New.
|
||||||
|
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
|
||||||
|
dg-error line number.
|
||||||
|
* testsuite/23_containers/unordered_set/
|
||||||
|
not_default_constructible_hash_neg.cc: Likewise.
|
||||||
|
|
||||||
PR libstdc++/56278
|
PR libstdc++/56278
|
||||||
* include/bits/hashtable_policy.h (_Hash_code_base): Make default
|
* include/bits/hashtable_policy.h (_Hash_code_base): Make default
|
||||||
constructor public.
|
constructor public.
|
||||||
|
|
|
@ -43,8 +43,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
= __not_<__and_<// Do not cache for fast hasher.
|
= __not_<__and_<// Do not cache for fast hasher.
|
||||||
__is_fast_hash<_Hash>,
|
__is_fast_hash<_Hash>,
|
||||||
// Mandatory to make local_iterator default
|
// Mandatory to make local_iterator default
|
||||||
// constructible.
|
// constructible and assignable.
|
||||||
is_default_constructible<_Hash>,
|
is_default_constructible<_Hash>,
|
||||||
|
is_copy_assignable<_Hash>,
|
||||||
// Mandatory to have erase not throwing.
|
// Mandatory to have erase not throwing.
|
||||||
__detail::__is_noexcept_hash<_Tp, _Hash>>>;
|
__detail::__is_noexcept_hash<_Tp, _Hash>>>;
|
||||||
|
|
||||||
|
@ -269,6 +270,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
"Cache the hash code or make functors involved in hash code"
|
"Cache the hash code or make functors involved in hash code"
|
||||||
" and bucket index computation default constructible");
|
" and bucket index computation default constructible");
|
||||||
|
|
||||||
|
// When hash codes are not cached local iterator inherits from
|
||||||
|
// __hash_code_base above to compute node bucket index so it has to be
|
||||||
|
// assignable.
|
||||||
|
static_assert(__if_hash_not_cached<
|
||||||
|
is_copy_assignable<__hash_code_base>>::value,
|
||||||
|
"Cache the hash code or make functors involved in hash code"
|
||||||
|
" and bucket index computation copy assignable");
|
||||||
|
|
||||||
public:
|
public:
|
||||||
template<typename _Keya, typename _Valuea, typename _Alloca,
|
template<typename _Keya, typename _Valuea, typename _Alloca,
|
||||||
typename _ExtractKeya, typename _Equala,
|
typename _ExtractKeya, typename _Equala,
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
// { dg-options "-std=gnu++0x" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
// Copyright (C) 2013 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/>.
|
||||||
|
|
||||||
|
// libstdc++/56267
|
||||||
|
|
||||||
|
#include <unordered_set>
|
||||||
|
|
||||||
|
struct hash : std::hash<int>
|
||||||
|
{
|
||||||
|
hash& operator=(const hash&) = delete;
|
||||||
|
};
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
std::unordered_set<int, hash> s{ 0, 1, 2 };
|
||||||
|
auto i = s.begin(0);
|
||||||
|
i = i;
|
||||||
|
}
|
|
@ -19,7 +19,7 @@
|
||||||
// with this library; see the file COPYING3. If not see
|
// with this library; see the file COPYING3. If not see
|
||||||
// <http://www.gnu.org/licenses/>.
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
// { dg-error "with noexcept" "" { target *-*-* } 251 }
|
// { dg-error "with noexcept" "" { target *-*-* } 252 }
|
||||||
|
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
// with this library; see the file COPYING3. If not see
|
// with this library; see the file COPYING3. If not see
|
||||||
// <http://www.gnu.org/licenses/>.
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
// { dg-error "default constructible" "" { target *-*-* } 267 }
|
// { dg-error "default constructible" "" { target *-*-* } 268 }
|
||||||
|
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue