diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-21 19:38:35 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-01-21 19:38:35 +0000 |
| commit | ea7bcfa14191be2fa6e088e88b2878015153caab (patch) | |
| tree | 1c31336cdfeff923f53c1b30eceec959e8b95b5b /libstdc++-v3/include/bits | |
| parent | 61364c598959d1bccf53fb8180f3e3b3797d40b1 (diff) | |
| download | ppe42-gcc-ea7bcfa14191be2fa6e088e88b2878015153caab.tar.gz ppe42-gcc-ea7bcfa14191be2fa6e088e88b2878015153caab.zip | |
PR libstdc++/56267
* include/bits/hashtable.h (__cache_default): Do not depend on
whether the hash function is DefaultConstructible or CopyAssignable.
(_Hashtable): Adjust static assertions.
* doc/xml/manual/containers.xml (containers.unordered.cache): Update.
* testsuite/23_containers/unordered_set/instantiation_neg.cc: Adjust
dg-error line number.
* testsuite/23_containers/unordered_set/
not_default_constructible_hash_neg.cc: Remove.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206904 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits')
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index e427c7f2383..4297c5fc750 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -42,10 +42,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __cache_default = __not_<__and_<// Do not cache for fast hasher. __is_fast_hash<_Hash>, - // Mandatory to make local_iterator default - // constructible and assignable. - is_default_constructible<_Hash>, - is_copy_assignable<_Hash>, // Mandatory to have erase not throwing. __detail::__is_noexcept_hash<_Tp, _Hash>>>; @@ -282,22 +278,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION "Functor used to map hash code to bucket index" " must be 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 - // default constructible. - static_assert(__if_hash_not_cached< - is_default_constructible<__hash_code_base_access>>::value, - "Cache the hash code or make functors involved in hash code" - " 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"); - template<typename _Keya, typename _Valuea, typename _Alloca, typename _ExtractKeya, typename _Equala, typename _H1a, typename _H2a, typename _Hasha, |
