Skip to content

Commit a0dd5bb

Browse files
committed
Fix -Wshadow warning
1 parent 58b82b6 commit a0dd5bb

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/boost/container/detail/adaptive_node_pool_impl.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,11 +1167,11 @@ struct private_adaptive_node_pool_impl_rt_data
11671167
{
11681168
typedef SizeType size_type;
11691169

1170-
BOOST_STATIC_CONSTEXPR size_type node_align = alignment_of<void*>::value;
1171-
BOOST_STATIC_CONSTEXPR size_type node_align_bits
1172-
= boost::container::dtl::log2_pow2<node_align>::value;
1170+
BOOST_STATIC_CONSTEXPR size_type PtrAlign = alignment_of<void*>::value;
1171+
BOOST_STATIC_CONSTEXPR size_type PtrAlignBits
1172+
= boost::container::dtl::log2_pow2<PtrAlign>::value;
11731173

1174-
typedef packed_3n_bits_ref<node_align_bits, size_type> packed_bits_t;
1174+
typedef packed_3n_bits_ref<PtrAlignBits, size_type> packed_bits_t;
11751175

11761176
private_adaptive_node_pool_impl_rt_data(size_type max_free_blocks)
11771177
: m_max_free_blocks(max_free_blocks)
@@ -1183,13 +1183,13 @@ struct private_adaptive_node_pool_impl_rt_data
11831183

11841184
void set_node_alignment(size_type alignment)
11851185
{
1186-
const size_type aligned_multiplier = alignment/node_align;
1186+
const size_type aligned_multiplier = alignment/PtrAlign;
11871187
const size_type aligned_shift = log2_ceil<size_type>(aligned_multiplier);
11881188
return packed_bits().store(aligned_shift);
11891189
}
11901190

11911191
size_type get_node_alignment() const
1192-
{ return node_align << packed_bits().load(); }
1192+
{ return PtrAlign << packed_bits().load(); }
11931193

11941194
size_type get_max_free_blocks() const
11951195
{ return m_max_free_blocks; }

0 commit comments

Comments
 (0)