@@ -325,7 +325,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree_balance_after_in
325325// nor any of its children refer to __z. end_node->__left_
326326// may be different than the value passed in as __root.
327327template <class _NodePtr >
328- _LIBCPP_HIDE_FROM_ABI void __tree_remove (_NodePtr __root, _NodePtr __z) _NOEXCEPT {
328+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree_remove (_NodePtr __root, _NodePtr __z) _NOEXCEPT {
329329 _LIBCPP_ASSERT_INTERNAL (__root != nullptr , " Root node should not be null" );
330330 _LIBCPP_ASSERT_INTERNAL (__z != nullptr , " The node to remove should not be null" );
331331 _LIBCPP_ASSERT_INTERNAL (std::__tree_invariant (__root), " The tree invariants should hold" );
@@ -1153,7 +1153,7 @@ public:
11531153 _LIBCPP_HIDE_FROM_ABI iterator __node_insert_multi (__node_pointer __nd);
11541154 _LIBCPP_HIDE_FROM_ABI iterator __node_insert_multi (const_iterator __p, __node_pointer __nd);
11551155
1156- _LIBCPP_HIDE_FROM_ABI iterator __remove_node_pointer (__node_pointer) _NOEXCEPT;
1156+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __remove_node_pointer (__node_pointer) _NOEXCEPT;
11571157
11581158#if _LIBCPP_STD_VER >= 17
11591159 template <class _NodeHandle , class _InsertReturnType >
@@ -1176,12 +1176,12 @@ public:
11761176 _LIBCPP_HIDE_FROM_ABI _NodeHandle __node_handle_extract (const_iterator);
11771177#endif
11781178
1179- _LIBCPP_HIDE_FROM_ABI iterator erase (const_iterator __p);
1180- _LIBCPP_HIDE_FROM_ABI iterator erase (const_iterator __f, const_iterator __l);
1179+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase (const_iterator __p);
1180+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase (const_iterator __f, const_iterator __l);
11811181 template <class _Key >
1182- _LIBCPP_HIDE_FROM_ABI size_type __erase_unique (const _Key& __k);
1182+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __erase_unique (const _Key& __k);
11831183 template <class _Key >
1184- _LIBCPP_HIDE_FROM_ABI size_type __erase_multi (const _Key& __k);
1184+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __erase_multi (const _Key& __k);
11851185
11861186 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
11871187 __insert_node_at (__parent_pointer __parent, __node_base_pointer& __child, __node_base_pointer __new_node) _NOEXCEPT;
@@ -1979,7 +1979,7 @@ __tree<_Tp, _Compare, _Allocator>::__node_insert_multi(const_iterator __p, __nod
19791979}
19801980
19811981template <class _Tp , class _Compare , class _Allocator >
1982- typename __tree<_Tp, _Compare, _Allocator>::iterator
1982+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
19831983__tree<_Tp, _Compare, _Allocator>::__remove_node_pointer(__node_pointer __ptr) _NOEXCEPT {
19841984 iterator __r (__ptr);
19851985 ++__r;
@@ -2110,7 +2110,7 @@ _LIBCPP_HIDE_FROM_ABI void __tree<_Tp, _Compare, _Allocator>::__node_handle_merg
21102110#endif // _LIBCPP_STD_VER >= 17
21112111
21122112template <class _Tp , class _Compare , class _Allocator >
2113- typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p) {
2113+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p) {
21142114 __node_pointer __np = __p.__get_np ();
21152115 iterator __r = __remove_node_pointer (__np);
21162116 __node_allocator& __na = __node_alloc ();
@@ -2120,7 +2120,7 @@ typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allo
21202120}
21212121
21222122template <class _Tp , class _Compare , class _Allocator >
2123- typename __tree<_Tp, _Compare, _Allocator>::iterator
2123+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
21242124__tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l) {
21252125 while (__f != __l)
21262126 __f = erase (__f);
@@ -2129,7 +2129,7 @@ __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l)
21292129
21302130template <class _Tp , class _Compare , class _Allocator >
21312131template <class _Key >
2132- typename __tree<_Tp, _Compare, _Allocator>::size_type
2132+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
21332133__tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k) {
21342134 iterator __i = find (__k);
21352135 if (__i == end ())
@@ -2140,7 +2140,7 @@ __tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k) {
21402140
21412141template <class _Tp , class _Compare , class _Allocator >
21422142template <class _Key >
2143- typename __tree<_Tp, _Compare, _Allocator>::size_type
2143+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
21442144__tree<_Tp, _Compare, _Allocator>::__erase_multi(const _Key& __k) {
21452145 pair<iterator, iterator> __p = __equal_range_multi (__k);
21462146 size_type __r = 0 ;
0 commit comments