File tree Expand file tree Collapse file tree 1 file changed +2
-24
lines changed
Expand file tree Collapse file tree 1 file changed +2
-24
lines changed Original file line number Diff line number Diff line change @@ -112,11 +112,7 @@ __root, have a non-null __parent_ field.
112112// Precondition: __x != nullptr.
113113template <class _NodePtr >
114114inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __tree_is_left_child (_NodePtr __x) _NOEXCEPT {
115- auto __0 = __x->__parent_ ;
116- _NodePtr __1 = __0->__left_ ;
117- _NodePtr __2 = __x;
118- return __1 == __2;
119- // return __x == __x->__parent_->__left_;
115+ return __x == __x->__parent_ ->__left_ ;
120116}
121117
122118// Determines if the subtree rooted at __x is a proper red black subtree. If
@@ -573,25 +569,7 @@ public:
573569 using __end_node_pointer _LIBCPP_NODEBUG = __rebind_pointer_t <_VoidPtr, __tree_end_node<pointer> >;
574570
575571 pointer __right_;
576-
577- // TODO: this is needed because of a bug in g++-15
578- // in the
579- // libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp
580- //
581- /*
582- libcxx/test-suite-install/include/c++/v1/__tree:114:33: error: result_decl not supported by dump_expr<expression
583- error> is not a constant expression
584-
585- # | 114 | return __x == __x->__parent_->__left_;
586-
587- # | | ~~~~~~~~~~~~~~~~^~~~~~~
588-
589- */
590- // #if _LIBCPP_STD_VER <= 26
591- // __end_node_pointer __parent_;
592- // #else
593- __end_node_pointer __parent_ = nullptr ;
594- // #endif
572+ __end_node_pointer __parent_;
595573 bool __is_black_;
596574
597575 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer __parent_unsafe () const {
You can’t perform that action at this time.
0 commit comments