Ticket #5996: shadow.patch
File shadow.patch, 9.6 KB (added by , 11 years ago) |
---|
-
boost/ptr_container/exception.hpp
24 24 { 25 25 const char* what_; 26 26 public: 27 bad_ptr_container_operation( const char* what ) : what_( what)27 bad_ptr_container_operation( const char* whatArg ) : what_( whatArg ) 28 28 { } 29 29 30 30 virtual const char* what() const throw() … … 38 38 class bad_index : public bad_ptr_container_operation 39 39 { 40 40 public: 41 bad_index( const char* what ) : bad_ptr_container_operation( what)41 bad_index( const char* whatArg ) : bad_ptr_container_operation( whatArg ) 42 42 { } 43 43 }; 44 44 -
boost/ptr_container/detail/move.hpp
20 20 template<typename Ptr> 21 21 class move_source { 22 22 public: 23 move_source(Ptr& ptr ) : ptr_(ptr) {}23 move_source(Ptr& ptrArg) : ptr_(ptrArg) {} 24 24 Ptr& ptr() const { return ptr_; } 25 25 private: 26 26 Ptr& ptr_; -
boost/ptr_container/detail/static_move_ptr.hpp
145 145 deleter_const_reference get_deleter() const { return impl_.second(); } 146 146 private: 147 147 template<typename TT, typename DD> 148 void check(const static_move_ptr<TT, DD>& ptr )148 void check(const static_move_ptr<TT, DD>& ptrArg) 149 149 { 150 150 typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible; 151 151 BOOST_STATIC_ASSERT(convertible::value); -
boost/ptr_container/detail/reversible_ptr_container.hpp
54 54 struct dynamic_clone_deleter 55 55 { 56 56 dynamic_clone_deleter() { } 57 dynamic_clone_deleter( Container& cont ) : cont(&cont) { }57 dynamic_clone_deleter( Container& contArg ) : cont(&contArg) { } 58 58 Container* cont; 59 59 60 60 template< class T > … … 287 287 288 288 private: 289 289 template< class ForwardIterator > 290 ForwardIterator advance( ForwardIterator begin , size_type n )290 ForwardIterator advance( ForwardIterator beginArg, size_type n ) 291 291 { 292 ForwardIterator iter = begin ;292 ForwardIterator iter = beginArg; 293 293 std::advance( iter, n ); 294 294 return iter; 295 295 } -
boost/unordered/detail/equivalent.hpp
248 248 node_pointer n = this->find_node(k); 249 249 if (!n) return 0; 250 250 251 std::size_t count = 0;251 std::size_t result = 0; 252 252 node_pointer it = n; 253 253 do { 254 254 it = static_cast<node_pointer>(it->group_prev_); 255 ++ count;255 ++result; 256 256 } while(it != n); 257 257 258 return count;258 return result; 259 259 } 260 260 261 261 std::pair<node_pointer, node_pointer> … … 523 523 524 524 std::size_t hash = this->hash_function()(k); 525 525 std::size_t bucket_index = hash % this->bucket_count_; 526 bucket_pointer bucket = this->get_bucket(bucket_index);526 bucket_pointer bucket_ptr = this->get_bucket(bucket_index); 527 527 528 previous_pointer prev = bucket ->next_;528 previous_pointer prev = bucket_ptr->next_; 529 529 if (!prev) return 0; 530 530 531 531 for (;;) … … 548 548 static_cast<node_pointer>(pos->group_prev_)->next_; 549 549 node_pointer end = static_cast<node_pointer>(end1); 550 550 prev->next_ = end1; 551 this->fix_buckets(bucket , prev, end);551 this->fix_buckets(bucket_ptr, prev, end); 552 552 return this->delete_nodes(pos, end); 553 553 } 554 554 … … 557 557 BOOST_ASSERT(r); 558 558 node_pointer next = static_cast<node_pointer>(r->next_); 559 559 560 bucket_pointer bucket = this->get_bucket(560 bucket_pointer bucket_ptr = this->get_bucket( 561 561 r->hash_ % this->bucket_count_); 562 previous_pointer prev = unlink_node(*bucket , r);562 previous_pointer prev = unlink_node(*bucket_ptr, r); 563 563 564 this->fix_buckets(bucket , prev, next);564 this->fix_buckets(bucket_ptr, prev, next); 565 565 566 566 this->delete_node(r); 567 567 -
boost/unordered/detail/buckets.hpp
478 478 479 479 // This is called after erasing a node or group of nodes to fix up 480 480 // the bucket pointers. 481 void fix_buckets(bucket_pointer bucket ,481 void fix_buckets(bucket_pointer bucket_ptr, 482 482 previous_pointer prev, node_pointer next) 483 483 { 484 484 if (!next) 485 485 { 486 if (bucket ->next_ == prev) bucket->next_ = node_pointer();486 if (bucket_ptr->next_ == prev) bucket_ptr->next_ = node_pointer(); 487 487 } 488 488 else 489 489 { 490 490 bucket_pointer next_bucket = this->get_bucket( 491 491 next->hash_ % this->bucket_count_); 492 492 493 if (next_bucket != bucket )493 if (next_bucket != bucket_ptr) 494 494 { 495 495 next_bucket->next_ = prev; 496 if (bucket ->next_ == prev) bucket->next_ = node_pointer();496 if (bucket_ptr->next_ == prev) bucket_ptr->next_ = node_pointer(); 497 497 } 498 498 } 499 499 } -
boost/unordered/detail/emplace_args.hpp
89 89 { \ 90 90 BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \ 91 91 BOOST_PP_CAT(emplace_args, n) ( \ 92 BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, B, a )\92 BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, B, aa) \ 93 93 ) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \ 94 94 {} \ 95 95 \ … … 116 116 117 117 #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ 118 118 BOOST_PP_CAT(a, n)( \ 119 boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(a , n)))119 boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(aa, n))) 120 120 121 121 #else 122 122 … … 126 126 BOOST_PP_CAT(B, n) BOOST_PP_CAT(a, n); 127 127 128 128 #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \ 129 BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a , n))129 BOOST_PP_CAT(a, n)(BOOST_PP_CAT(aa, n)) 130 130 131 131 #endif 132 132 -
boost/unordered/detail/unique.hpp
525 525 526 526 std::size_t hash = this->hash_function()(k); 527 527 std::size_t bucket_index = hash % this->bucket_count_; 528 bucket_pointer bucket = this->get_bucket(bucket_index);528 bucket_pointer bucket_ptr = this->get_bucket(bucket_index); 529 529 530 previous_pointer prev = bucket ->next_;530 previous_pointer prev = bucket_ptr->next_; 531 531 if (!prev) return 0; 532 532 533 533 for (;;) … … 547 547 node_pointer pos = static_cast<node_pointer>(prev->next_); 548 548 node_pointer end = static_cast<node_pointer>(pos->next_); 549 549 prev->next_ = pos->next_; 550 this->fix_buckets(bucket , prev, end);550 this->fix_buckets(bucket_ptr, prev, end); 551 551 return this->delete_nodes(pos, end); 552 552 } 553 553 … … 556 556 BOOST_ASSERT(r); 557 557 node_pointer next = static_cast<node_pointer>(r->next_); 558 558 559 bucket_pointer bucket = this->get_bucket(559 bucket_pointer bucket_ptr = this->get_bucket( 560 560 r->hash_ % this->bucket_count_); 561 previous_pointer prev = unlink_node(*bucket , r);561 previous_pointer prev = unlink_node(*bucket_ptr, r); 562 562 563 this->fix_buckets(bucket , prev, next);563 this->fix_buckets(bucket_ptr, prev, next); 564 564 565 565 this->delete_node(r); 566 566 -
boost/concept_check.hpp
1050 1050 c.swap(c); 1051 1051 } 1052 1052 1053 void const_constraints(const C& c ) {1054 ci = c .begin();1055 ci = c .end();1056 n = c .size();1057 b = c .empty();1053 void const_constraints(const C& cc) { 1054 ci = cc.begin(); 1055 ci = cc.end(); 1056 n = cc.size(); 1057 b = cc.empty(); 1058 1058 } 1059 1059 1060 1060 private: