diff --git a/include/boost/unordered/detail/foa.hpp b/include/boost/unordered/detail/foa.hpp index 331ec82b..96456bcb 100644 --- a/include/boost/unordered/detail/foa.hpp +++ b/include/boost/unordered/detail/foa.hpp @@ -256,7 +256,7 @@ struct pow2_size_policy struct pow2_quadratic_prober { - pow2_quadratic_prober(std::size_t pos):pos{pos}{} + pow2_quadratic_prober(std::size_t _pos):pos{_pos}{} inline std::size_t get()const{return pos;} @@ -305,9 +305,9 @@ private: template friend class table_iterator; template friend class table; - table_iterator(Group* pg,std::size_t n,const Value* p): + table_iterator(Group* pg,std::size_t n,const Value* _p): pc{reinterpret_cast(const_cast(pg))+n}, - p{const_cast(p)} + p{const_cast(_p)} {} inline std::size_t rebase() noexcept @@ -378,9 +378,9 @@ public: const_iterator>::type; table( - std::size_t n=0,const Hash& h=Hash(),const Pred& pred=Pred(), - const Allocator& al=Allocator()): - h{h},pred{pred},al{al},size_{0},arrays{new_arrays(n)},ml{max_load()} + std::size_t n=0,const Hash& _h=Hash(),const Pred& _pred=Pred(), + const Allocator& _al=Allocator()): + h{_h},pred{_pred},al{_al},size_{0},arrays{new_arrays(n)},ml{max_load()} {} table(const table& x):table(x,x.al){} @@ -399,8 +399,8 @@ public: x.ml=x.max_load(); } - table(const table& x,const Allocator& al): - h{x.h},pred{x.pred},al{al},size_{0}, + table(const table& x,const Allocator& _al): + h{x.h},pred{x.pred},al{_al},size_{0}, arrays{new_arrays(std::size_t(std::ceil(x.size()/mlf)))}, ml{max_load()} { @@ -416,8 +416,8 @@ public: BOOST_CATCH_END } - table(table&& x,const Allocator& al): - table{0,std::move(x.h),std::move(x.pred),al} + table(table&& x,const Allocator& _al): + table{0,std::move(x.h),std::move(x.pred),_al} { if(al==x.al){ size_=x.size_; @@ -852,8 +852,8 @@ private: for(std::size_t pos=0;;++pos,++pg){ auto mask=pg->match_occupied(); while(mask){ - auto n=unchecked_countr_zero(mask); - pg->reset(n); + auto nz=unchecked_countr_zero(mask); + pg->reset(nz); if(!(--num_tx))goto continue_; } }