From 92ce66be64fb83a04d7a6f3c9b8a7f110f333805 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 22 Dec 2017 16:54:05 +0000 Subject: [PATCH] Rename 'bucket' variable to avoid shadow warning --- include/boost/unordered/detail/implementation.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index a6e1fd31..1a563131 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -3216,9 +3216,9 @@ namespace boost { link_pointer prev = this->get_previous_start(); std::size_t last_bucket = this->bucket_count_; for (node_pointer n = src.begin(); n; n = next_node(n)) { - std::size_t bucket = n->get_bucket(); - if (bucket != last_bucket) { - this->get_bucket_pointer(bucket)->next_ = prev; + std::size_t n_bucket = n->get_bucket(); + if (n_bucket != last_bucket) { + this->get_bucket_pointer(n_bucket)->next_ = prev; } node_pointer n2 = boost::unordered::detail::func::construct_node( this->node_alloc(), boost::move(n->value())); @@ -3226,7 +3226,7 @@ namespace boost { prev->next_ = n2; ++size_; prev = n2; - last_bucket = bucket; + last_bucket = n_bucket; } } }