Skip to content

Also update __gnu_cxx::hash_XXX after (#151951) #160305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+4 −25
Closed

Also update __gnu_cxx::hash_XXX after (#151951) #160305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions libcxx/include/ext/hash_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ public:
const hasher& __hf,
const key_equal& __eql,
const allocator_type& __a);
_LIBCPP_HIDE_FROM_ABI hash_map(const hash_map& __u);
_LIBCPP_HIDE_FROM_ABI hash_map(const hash_map& __u) = default;

_LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const { return allocator_type(__table_.__node_alloc()); }

Expand Down Expand Up @@ -569,12 +569,6 @@ hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
insert(__first, __last);
}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(const hash_map& __u) : __table_(__u.__table_) {
__table_.__rehash_unique(__u.bucket_count());
insert(__u.begin(), __u.end());
}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
typename hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(const key_type& __k) {
Expand Down Expand Up @@ -696,7 +690,7 @@ public:
const hasher& __hf,
const key_equal& __eql,
const allocator_type& __a);
_LIBCPP_HIDE_FROM_ABI hash_multimap(const hash_multimap& __u);
_LIBCPP_HIDE_FROM_ABI hash_multimap(const hash_multimap& __u) = default;

_LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const { return allocator_type(__table_.__node_alloc()); }

Expand Down Expand Up @@ -786,9 +780,6 @@ hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
insert(__first, __last);
}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(const hash_multimap& __u) : __table_(__u.__table_) {}

template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
Expand Down
16 changes: 2 additions & 14 deletions libcxx/include/ext/hash_set
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public:
const hasher& __hf,
const key_equal& __eql,
const allocator_type& __a);
_LIBCPP_HIDE_FROM_ABI hash_set(const hash_set& __u);
_LIBCPP_HIDE_FROM_ABI hash_set(const hash_set& __u) = default;

_LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const { return allocator_type(__table_.__node_alloc()); }

Expand Down Expand Up @@ -355,12 +355,6 @@ hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(
insert(__first, __last);
}

template <class _Value, class _Hash, class _Pred, class _Alloc>
hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(const hash_set& __u) : __table_(__u.__table_) {
__table_.__rehash_unique(__u.bucket_count());
insert(__u.begin(), __u.end());
}

template <class _Value, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_set<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
Expand Down Expand Up @@ -445,7 +439,7 @@ public:
const hasher& __hf,
const key_equal& __eql,
const allocator_type& __a);
_LIBCPP_HIDE_FROM_ABI hash_multiset(const hash_multiset& __u);
_LIBCPP_HIDE_FROM_ABI hash_multiset(const hash_multiset& __u) = default;

_LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const { return allocator_type(__table_.__node_alloc()); }

Expand Down Expand Up @@ -533,12 +527,6 @@ hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
insert(__first, __last);
}

template <class _Value, class _Hash, class _Pred, class _Alloc>
hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(const hash_multiset& __u) : __table_(__u.__table_) {
__table_.__rehash_multi(__u.bucket_count());
insert(__u.begin(), __u.end());
}

template <class _Value, class _Hash, class _Pred, class _Alloc>
template <class _InputIterator>
inline void hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first, _InputIterator __last) {
Expand Down
Loading