This commit is contained in:
Daniel James
2017-12-28 11:44:57 +00:00
parent 32773fb023
commit 9d558b010d
3 changed files with 14 additions and 20 deletions

View File

@ -2097,8 +2097,7 @@ namespace boost {
// //
// all no throw // all no throw
template <typename Node> template <typename Node> struct l_iterator
struct l_iterator
{ {
#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
template <typename Node2> template <typename Node2>
@ -2157,8 +2156,7 @@ namespace boost {
} }
}; };
template <typename Node> template <typename Node> struct cl_iterator
struct cl_iterator
{ {
friend struct boost::unordered::iterator_detail::l_iterator<Node>; friend struct boost::unordered::iterator_detail::l_iterator<Node>;
@ -2224,8 +2222,7 @@ namespace boost {
} }
}; };
template <typename Node> template <typename Node> struct iterator
struct iterator
{ {
#if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
template <typename> template <typename>
@ -2279,8 +2276,7 @@ namespace boost {
} }
}; };
template <typename Node> template <typename Node> struct c_iterator
struct c_iterator
{ {
friend struct boost::unordered::iterator_detail::iterator<Node>; friend struct boost::unordered::iterator_detail::iterator<Node>;
@ -3251,8 +3247,8 @@ namespace boost {
void delete_buckets() void delete_buckets()
{ {
if (buckets_) { if (buckets_) {
node_pointer n = node_pointer n = static_cast<node_pointer>(
static_cast<node_pointer>(get_bucket_pointer(bucket_count_)->next_); get_bucket_pointer(bucket_count_)->next_);
if (bucket::extra_node) { if (bucket::extra_node) {
node_pointer next = next_node(n); node_pointer next = next_node(n);
@ -3569,7 +3565,8 @@ namespace boost {
link_pointer start_node = this->get_previous_start(); link_pointer start_node = this->get_previous_start();
if (start_node->next_) { if (start_node->next_) {
this->get_bucket_pointer(node_bucket(next_node(start_node)))->next_ = n; this->get_bucket_pointer(node_bucket(next_node(start_node)))
->next_ = n;
} }
b->next_ = start_node; b->next_ = start_node;
@ -4092,7 +4089,8 @@ namespace boost {
link_pointer start_node = this->get_previous_start(); link_pointer start_node = this->get_previous_start();
if (start_node->next_) { if (start_node->next_) {
this->get_bucket_pointer(this->node_bucket(next_node(start_node))) this
->get_bucket_pointer(this->node_bucket(next_node(start_node)))
->next_ = n; ->next_ = n;
} }

View File

@ -24,8 +24,7 @@ namespace test {
proxy& operator=(proxy const&); proxy& operator=(proxy const&);
}; };
template <class Iterator> template <class Iterator> struct input_iterator_adaptor
struct input_iterator_adaptor
{ {
typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type
value_type; value_type;
@ -65,8 +64,7 @@ namespace test {
return input_iterator_adaptor<Iterator>(it); return input_iterator_adaptor<Iterator>(it);
} }
template <class Iterator> template <class Iterator> struct copy_iterator_adaptor
struct copy_iterator_adaptor
{ {
typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::value_type
value_type; value_type;

View File

@ -81,8 +81,7 @@ namespace test {
list_data& operator=(list_data const&); list_data& operator=(list_data const&);
}; };
template <typename T> template <typename T> class list_iterator
class list_iterator
{ {
friend class list_const_iterator<T>; friend class list_const_iterator<T>;
friend class test::list<T>; friend class test::list<T>;
@ -118,8 +117,7 @@ namespace test {
bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; } bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
}; };
template <typename T> template <typename T> class list_const_iterator
class list_const_iterator
{ {
friend class list_iterator<T>; friend class list_iterator<T>;
friend class test::list<T>; friend class test::list<T>;