Index: boost/ptr_container/exception.hpp =================================================================== --- boost/ptr_container/exception.hpp (revision 74788) +++ boost/ptr_container/exception.hpp (working copy) @@ -24,7 +24,7 @@ { const char* what_; public: - bad_ptr_container_operation( const char* what ) : what_( what ) + bad_ptr_container_operation( const char* whatArg ) : what_( whatArg ) { } virtual const char* what() const throw() @@ -38,7 +38,7 @@ class bad_index : public bad_ptr_container_operation { public: - bad_index( const char* what ) : bad_ptr_container_operation( what ) + bad_index( const char* whatArg ) : bad_ptr_container_operation( whatArg ) { } }; Index: boost/ptr_container/detail/move.hpp =================================================================== --- boost/ptr_container/detail/move.hpp (revision 74788) +++ boost/ptr_container/detail/move.hpp (working copy) @@ -20,7 +20,7 @@ template class move_source { public: - move_source(Ptr& ptr) : ptr_(ptr) {} + move_source(Ptr& ptrArg) : ptr_(ptrArg) {} Ptr& ptr() const { return ptr_; } private: Ptr& ptr_; Index: boost/ptr_container/detail/static_move_ptr.hpp =================================================================== --- boost/ptr_container/detail/static_move_ptr.hpp (revision 74788) +++ boost/ptr_container/detail/static_move_ptr.hpp (working copy) @@ -145,7 +145,7 @@ deleter_const_reference get_deleter() const { return impl_.second(); } private: template - void check(const static_move_ptr& ptr) + void check(const static_move_ptr& ptrArg) { typedef move_ptrs::is_smart_ptr_convertible convertible; BOOST_STATIC_ASSERT(convertible::value); Index: boost/ptr_container/detail/reversible_ptr_container.hpp =================================================================== --- boost/ptr_container/detail/reversible_ptr_container.hpp (revision 74788) +++ boost/ptr_container/detail/reversible_ptr_container.hpp (working copy) @@ -54,7 +54,7 @@ struct dynamic_clone_deleter { dynamic_clone_deleter() { } - dynamic_clone_deleter( Container& cont ) : cont(&cont) { } + dynamic_clone_deleter( Container& contArg ) : cont(&contArg) { } Container* cont; template< class T > @@ -287,9 +287,9 @@ private: template< class ForwardIterator > - ForwardIterator advance( ForwardIterator begin, size_type n ) + ForwardIterator advance( ForwardIterator beginArg, size_type n ) { - ForwardIterator iter = begin; + ForwardIterator iter = beginArg; std::advance( iter, n ); return iter; } Index: boost/unordered/detail/equivalent.hpp =================================================================== --- boost/unordered/detail/equivalent.hpp (revision 74788) +++ boost/unordered/detail/equivalent.hpp (working copy) @@ -248,14 +248,14 @@ node_pointer n = this->find_node(k); if (!n) return 0; - std::size_t count = 0; + std::size_t result = 0; node_pointer it = n; do { it = static_cast(it->group_prev_); - ++count; + ++result; } while(it != n); - return count; + return result; } std::pair @@ -523,9 +523,9 @@ std::size_t hash = this->hash_function()(k); std::size_t bucket_index = hash % this->bucket_count_; - bucket_pointer bucket = this->get_bucket(bucket_index); + bucket_pointer bucket_ptr = this->get_bucket(bucket_index); - previous_pointer prev = bucket->next_; + previous_pointer prev = bucket_ptr->next_; if (!prev) return 0; for (;;) @@ -548,7 +548,7 @@ static_cast(pos->group_prev_)->next_; node_pointer end = static_cast(end1); prev->next_ = end1; - this->fix_buckets(bucket, prev, end); + this->fix_buckets(bucket_ptr, prev, end); return this->delete_nodes(pos, end); } @@ -557,11 +557,11 @@ BOOST_ASSERT(r); node_pointer next = static_cast(r->next_); - bucket_pointer bucket = this->get_bucket( + bucket_pointer bucket_ptr = this->get_bucket( r->hash_ % this->bucket_count_); - previous_pointer prev = unlink_node(*bucket, r); + previous_pointer prev = unlink_node(*bucket_ptr, r); - this->fix_buckets(bucket, prev, next); + this->fix_buckets(bucket_ptr, prev, next); this->delete_node(r); Index: boost/unordered/detail/buckets.hpp =================================================================== --- boost/unordered/detail/buckets.hpp (revision 74788) +++ boost/unordered/detail/buckets.hpp (working copy) @@ -478,22 +478,22 @@ // This is called after erasing a node or group of nodes to fix up // the bucket pointers. - void fix_buckets(bucket_pointer bucket, + void fix_buckets(bucket_pointer bucket_ptr, previous_pointer prev, node_pointer next) { if (!next) { - if (bucket->next_ == prev) bucket->next_ = node_pointer(); + if (bucket_ptr->next_ == prev) bucket_ptr->next_ = node_pointer(); } else { bucket_pointer next_bucket = this->get_bucket( next->hash_ % this->bucket_count_); - if (next_bucket != bucket) + if (next_bucket != bucket_ptr) { next_bucket->next_ = prev; - if (bucket->next_ == prev) bucket->next_ = node_pointer(); + if (bucket_ptr->next_ == prev) bucket_ptr->next_ = node_pointer(); } } } Index: boost/unordered/detail/emplace_args.hpp =================================================================== --- boost/unordered/detail/emplace_args.hpp (revision 74788) +++ boost/unordered/detail/emplace_args.hpp (working copy) @@ -89,7 +89,7 @@ { \ BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \ BOOST_PP_CAT(emplace_args, n) ( \ - BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, B, a) \ + BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, B, aa) \ ) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \ {} \ \ @@ -116,7 +116,7 @@ #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ BOOST_PP_CAT(a, n)( \ - boost::forward(BOOST_PP_CAT(a, n))) + boost::forward(BOOST_PP_CAT(aa, n))) #else @@ -126,7 +126,7 @@ BOOST_PP_CAT(B, n) BOOST_PP_CAT(a, n); #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ - BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a, n)) + BOOST_PP_CAT(a, n)(BOOST_PP_CAT(aa, n)) #endif Index: boost/unordered/detail/unique.hpp =================================================================== --- boost/unordered/detail/unique.hpp (revision 74788) +++ boost/unordered/detail/unique.hpp (working copy) @@ -525,9 +525,9 @@ std::size_t hash = this->hash_function()(k); std::size_t bucket_index = hash % this->bucket_count_; - bucket_pointer bucket = this->get_bucket(bucket_index); + bucket_pointer bucket_ptr = this->get_bucket(bucket_index); - previous_pointer prev = bucket->next_; + previous_pointer prev = bucket_ptr->next_; if (!prev) return 0; for (;;) @@ -547,7 +547,7 @@ node_pointer pos = static_cast(prev->next_); node_pointer end = static_cast(pos->next_); prev->next_ = pos->next_; - this->fix_buckets(bucket, prev, end); + this->fix_buckets(bucket_ptr, prev, end); return this->delete_nodes(pos, end); } @@ -556,11 +556,11 @@ BOOST_ASSERT(r); node_pointer next = static_cast(r->next_); - bucket_pointer bucket = this->get_bucket( + bucket_pointer bucket_ptr = this->get_bucket( r->hash_ % this->bucket_count_); - previous_pointer prev = unlink_node(*bucket, r); + previous_pointer prev = unlink_node(*bucket_ptr, r); - this->fix_buckets(bucket, prev, next); + this->fix_buckets(bucket_ptr, prev, next); this->delete_node(r); Index: boost/concept_check.hpp =================================================================== --- boost/concept_check.hpp (revision 74788) +++ boost/concept_check.hpp (working copy) @@ -1050,11 +1050,11 @@ c.swap(c); } - void const_constraints(const C& c) { - ci = c.begin(); - ci = c.end(); - n = c.size(); - b = c.empty(); + void const_constraints(const C& cc) { + ci = cc.begin(); + ci = cc.end(); + n = cc.size(); + b = cc.empty(); } private: