Skip to content

Commit 0f3d0f1

Browse files
copy_assign.pass.cpp
1 parent 33fea96 commit 0f3d0f1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

libcxx/include/__tree

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ __tree<_Tp, _Compare, _Allocator>::_DetachedTreeCache::__detach_from_tree(__tree
13491349
__t->__size_ = 0;
13501350
// __cache->__left_ == nullptr
13511351
if (__cache->__right_ != nullptr)
1352-
__cache = static_cast<__node_pointer>(__cache->__right_);
1352+
__cache = std::__static_fancy_pointer_cast<__node_pointer>(__cache->__right_);
13531353
// __cache->__left_ == nullptr
13541354
// __cache->__right_ == nullptr
13551355
return __cache;
@@ -1364,16 +1364,16 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node
13641364
__tree<_Tp, _Compare, _Allocator>::_DetachedTreeCache::__detach_next(__node_pointer __cache) _NOEXCEPT {
13651365
if (__cache->__parent_ == nullptr)
13661366
return nullptr;
1367-
if (std::__tree_is_left_child(static_cast<__node_base_pointer>(__cache))) {
1367+
if (std::__tree_is_left_child(std::__static_fancy_pointer_cast<__node_base_pointer>(__cache))) {
13681368
__cache->__parent_->__left_ = nullptr;
1369-
__cache = static_cast<__node_pointer>(__cache->__parent_);
1369+
__cache = std::__static_fancy_pointer_cast<__node_pointer>(__cache->__parent_);
13701370
if (__cache->__right_ == nullptr)
13711371
return __cache;
13721372
return static_cast<__node_pointer>(std::__tree_leaf(__cache->__right_));
13731373
}
13741374
// __cache is right child
13751375
__cache->__parent_unsafe()->__right_ = nullptr;
1376-
__cache = static_cast<__node_pointer>(__cache->__parent_);
1376+
__cache = std::__static_fancy_pointer_cast<__node_pointer>(__cache->__parent_);
13771377
if (__cache->__left_ == nullptr)
13781378
return __cache;
13791379
return static_cast<__node_pointer>(std::__tree_leaf(__cache->__left_));
@@ -1637,7 +1637,7 @@ __tree<_Tp, _Compare, _Allocator>::__find_leaf_high(__end_node_pointer& __parent
16371637
if (__nd->__right_ != nullptr)
16381638
__nd = static_cast<__node_pointer>(__nd->__right_);
16391639
else {
1640-
__parent = static_cast<__end_node_pointer>(__nd);
1640+
__parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__nd);
16411641
return __nd->__right_;
16421642
}
16431643
}
@@ -1668,7 +1668,7 @@ __tree<_Tp, _Compare, _Allocator>::__find_leaf(
16681668
return __parent->__left_;
16691669
} else {
16701670
__parent = static_cast<__end_node_pointer>(__prior.__ptr_);
1671-
return static_cast<__node_base_pointer>(__prior.__ptr_)->__right_;
1671+
return std::__static_fancy_pointer_cast<__node_base_pointer>(__prior.__ptr_)->__right_;
16721672
}
16731673
}
16741674
// __v < *prev(__hint)
@@ -1976,7 +1976,7 @@ __tree<_Tp, _Compare, _Allocator>::__emplace_hint_multi(const_iterator __p, _Arg
19761976
__node_holder __h = __construct_node(std::forward<_Args>(__args)...);
19771977
__end_node_pointer __parent;
19781978
__node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
1979-
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
1979+
__insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
19801980
return iterator(static_cast<__node_pointer>(__h.release()));
19811981
}
19821982

@@ -2001,7 +2001,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterat
20012001
__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(__node_pointer __nd) {
20022002
__end_node_pointer __parent;
20032003
__node_base_pointer& __child = __find_leaf_high(__parent, __nd->__value_);
2004-
__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
2004+
__insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__nd));
20052005
return iterator(__nd);
20062006
}
20072007

0 commit comments

Comments
 (0)