feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Fix -Wshadow warnings

Browse Source
This commit is contained in:
Ion Gaztañaga
2021-12-27 14:40:29 +01:00
parent 40735223d5
commit ea3521bf14
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/container/detail/node_alloc_holder.hpp
View File

@@ -394,9 +394,8 @@ struct node_alloc_holder
icont_iterator erase_range(const icont_iterator &first, const icont_iterator &last, version_2) icont_iterator erase_range(const icont_iterator &first, const icont_iterator &last, version_2)
{ {
typedef typename NodeAlloc::multiallocation_chain multiallocation_chain;
NodeAlloc & nalloc = this->node_alloc(); NodeAlloc & nalloc = this->node_alloc();
multiallocation_chain chain; typename NodeAlloc::multiallocation_chain chain;
allocator_destroyer_and_chain_builder<NodeAlloc> chain_builder(nalloc, chain); allocator_destroyer_and_chain_builder<NodeAlloc> chain_builder(nalloc, chain);
icont_iterator ret_it = this->icont().erase_and_dispose(first, last, chain_builder); icont_iterator ret_it = this->icont().erase_and_dispose(first, last, chain_builder);
nalloc.deallocate_individual(chain); nalloc.deallocate_individual(chain);

4
include/boost/container/node_handle.hpp
View File

@@ -418,8 +418,8 @@ struct insert_return_type_base
{} {}
template<class RelatedIt, class RelatedNode> template<class RelatedIt, class RelatedNode>
insert_return_type_base(bool insert, RelatedIt it, BOOST_RV_REF(RelatedNode) node) insert_return_type_base(bool insert, RelatedIt it, BOOST_RV_REF(RelatedNode) n)
: inserted(insert), position(it), node(boost::move(node)) : inserted(insert), position(it), node(boost::move(n))
{} {}
insert_return_type_base & operator=(BOOST_RV_REF(insert_return_type_base) other) insert_return_type_base & operator=(BOOST_RV_REF(insert_return_type_base) other)

8
include/boost/container/vector.hpp
View File

@@ -824,12 +824,12 @@ private:
{ return this->m_holder.steal_resources(x.m_holder); } { return this->m_holder.steal_resources(x.m_holder); }
template<class AllocFwd> template<class AllocFwd>
BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type capacity, BOOST_FWD_REF(AllocFwd) a) BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type cap, BOOST_FWD_REF(AllocFwd) a)
: m_holder(initial_capacity_t(), initial_memory, capacity, ::boost::forward<AllocFwd>(a)) : m_holder(initial_capacity_t(), initial_memory, cap, ::boost::forward<AllocFwd>(a))
{} {}
BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type capacity) BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type cap)
: m_holder(initial_capacity_t(), initial_memory, capacity) : m_holder(initial_capacity_t(), initial_memory, cap)
{} {}
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED

2
test/vector_test.cpp
View File

@@ -61,7 +61,7 @@ struct X;
template<typename T> template<typename T>
struct XRef struct XRef
{ {
explicit XRef(T* ptr) : ptr(ptr) {} explicit XRef(T* p) : ptr(p) {}
operator T*() const { return ptr; } operator T*() const { return ptr; }
T* ptr; T* ptr;
}; };