feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

Fix -Wshadow warnings

Browse Source
This commit is contained in:
Ion Gaztañaga
2021-12-27 14:37:12 +01:00
parent 87081669c3
commit 65353e038b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/intrusive/hashtable.hpp
View File

@ -483,9 +483,9 @@ class incremental_rehash_rollback
public:
incremental_rehash_rollback
(bucket_type &source_bucket, bucket_type &destiny_bucket, split_traits &split_traits)
(bucket_type &source_bucket, bucket_type &destiny_bucket, split_traits &split_tr)
: source_bucket_(source_bucket), destiny_bucket_(destiny_bucket)
, split_traits_(split_traits), released_(false)
, split_traits_(split_tr), released_(false)
{}
BOOST_INTRUSIVE_FORCEINLINE void release()
@ -2586,9 +2586,9 @@ class hashtable_impl
iterator find(const KeyType &key, KeyHasher hash_func, KeyEqual equal_func)
{
size_type bucket_n;
std::size_t hash;
std::size_t h;
siterator prev;
return iterator( this->priv_find(key, hash_func, equal_func, bucket_n, hash, prev)
return iterator( this->priv_find(key, hash_func, equal_func, bucket_n, h, prev)
, &this->get_bucket_value_traits());
}

4
include/boost/intrusive/unordered_set.hpp
View File

@ -215,8 +215,8 @@ class unordered_set_impl
//! @copydoc ::boost::intrusive::hashtable::insert_unique_check(const KeyType&,KeyHasher,KeyEqual,insert_commit_data&)
template<class KeyType, class KeyHasher, class KeyEqual>
BOOST_INTRUSIVE_FORCEINLINE std::pair<iterator, bool> insert_check
(const KeyType &key, KeyHasher hasher, KeyEqual key_value_equal, insert_commit_data &commit_data)
{ return table_type::insert_unique_check(key, hasher, key_value_equal, commit_data); }
(const KeyType &key, KeyHasher hash_func, KeyEqual key_value_equal, insert_commit_data &commit_data)
{ return table_type::insert_unique_check(key, hash_func, key_value_equal, commit_data); }
//! @copydoc ::boost::intrusive::hashtable::insert_unique_commit
BOOST_INTRUSIVE_FORCEINLINE iterator insert_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT