diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp index 994fde2..852c463 100644 --- a/include/boost/container/detail/node_alloc_holder.hpp +++ b/include/boost/container/detail/node_alloc_holder.hpp @@ -394,9 +394,8 @@ struct node_alloc_holder 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(); - multiallocation_chain chain; + typename NodeAlloc::multiallocation_chain chain; allocator_destroyer_and_chain_builder chain_builder(nalloc, chain); icont_iterator ret_it = this->icont().erase_and_dispose(first, last, chain_builder); nalloc.deallocate_individual(chain); diff --git a/include/boost/container/node_handle.hpp b/include/boost/container/node_handle.hpp index ef1d71f..9a39112 100644 --- a/include/boost/container/node_handle.hpp +++ b/include/boost/container/node_handle.hpp @@ -418,8 +418,8 @@ struct insert_return_type_base {} template - insert_return_type_base(bool insert, RelatedIt it, BOOST_RV_REF(RelatedNode) node) - : inserted(insert), position(it), node(boost::move(node)) + insert_return_type_base(bool insert, RelatedIt it, BOOST_RV_REF(RelatedNode) n) + : inserted(insert), position(it), node(boost::move(n)) {} insert_return_type_base & operator=(BOOST_RV_REF(insert_return_type_base) other) diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp index de4a56b..0efde8d 100644 --- a/include/boost/container/vector.hpp +++ b/include/boost/container/vector.hpp @@ -824,12 +824,12 @@ private: { return this->m_holder.steal_resources(x.m_holder); } template - BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type capacity, BOOST_FWD_REF(AllocFwd) a) - : m_holder(initial_capacity_t(), initial_memory, capacity, ::boost::forward(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, cap, ::boost::forward(a)) {} - BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type capacity) - : m_holder(initial_capacity_t(), initial_memory, capacity) + BOOST_CONTAINER_FORCEINLINE vector(initial_capacity_t, pointer initial_memory, size_type cap) + : m_holder(initial_capacity_t(), initial_memory, cap) {} #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED diff --git a/test/vector_test.cpp b/test/vector_test.cpp index 180980d..8a5f37f 100644 --- a/test/vector_test.cpp +++ b/test/vector_test.cpp @@ -61,7 +61,7 @@ struct X; template struct XRef { - explicit XRef(T* ptr) : ptr(ptr) {} + explicit XRef(T* p) : ptr(p) {} operator T*() const { return ptr; } T* ptr; };