@@ -952,9 +952,15 @@ public:
952952 }
953953
954954private:
955- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const __node_allocator& __node_alloc () const _NOEXCEPT { return __node_alloc_; }
956- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __end_node_pointer& __begin_node () _NOEXCEPT { return __begin_node_; }
957- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const __end_node_pointer& __begin_node () const _NOEXCEPT { return __begin_node_; }
955+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const __node_allocator& __node_alloc () const _NOEXCEPT {
956+ return __node_alloc_;
957+ }
958+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __end_node_pointer& __begin_node () _NOEXCEPT {
959+ return __begin_node_;
960+ }
961+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const __end_node_pointer& __begin_node () const _NOEXCEPT {
962+ return __begin_node_;
963+ }
958964
959965public:
960966 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type __alloc () const _NOEXCEPT {
@@ -1169,12 +1175,13 @@ public:
11691175 // new (std::addressof(kk))(__key_type)(__value.first);
11701176 // __emplace_hint_unique(__p, std::move(kk), std::move(__value.second));
11711177 // } else {
1172- __emplace_hint_unique (__p, const_cast <__key_type&&>(__value.first ), std::move (__value.second ));
1178+ __emplace_hint_unique (__p, const_cast <__key_type&&>(__value.first ), std::move (__value.second ));
11731179 // }
11741180 }
11751181
11761182 template <class _ValueT = _Tp, __enable_if_t <!__is_tree_value_type<_ValueT>::value, int > = 0 >
1177- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __insert_unique_from_orphaned_node (const_iterator __p, _Tp&& __value) {
1183+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
1184+ __insert_unique_from_orphaned_node (const_iterator __p, _Tp&& __value) {
11781185 __emplace_hint_unique (__p, std::move (__value));
11791186 }
11801187
@@ -1205,7 +1212,8 @@ public:
12051212 }
12061213
12071214 template <class _ValueT = _Tp, __enable_if_t <!__is_tree_value_type<_ValueT>::value, int > = 0 >
1208- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __insert_multi_from_orphaned_node (const_iterator __p, _Tp&& __value) {
1215+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
1216+ __insert_multi_from_orphaned_node (const_iterator __p, _Tp&& __value) {
12091217 __emplace_hint_multi (__p, std::move (__value));
12101218 }
12111219
@@ -1266,7 +1274,8 @@ public:
12661274 return __lower_bound (__v, __root (), __end_node ());
12671275 }
12681276 template <class _Key >
1269- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __lower_bound (const _Key& __v, __node_pointer __root, __end_node_pointer __result);
1277+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
1278+ __lower_bound (const _Key& __v, __node_pointer __root, __end_node_pointer __result);
12701279 template <class _Key >
12711280 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator lower_bound (const _Key& __v) const {
12721281 return __lower_bound (__v, __root (), __end_node ());
@@ -1279,7 +1288,8 @@ public:
12791288 return __upper_bound (__v, __root (), __end_node ());
12801289 }
12811290 template <class _Key >
1282- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __upper_bound (const _Key& __v, __node_pointer __root, __end_node_pointer __result);
1291+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
1292+ __upper_bound (const _Key& __v, __node_pointer __root, __end_node_pointer __result);
12831293 template <class _Key >
12841294 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator upper_bound (const _Key& __v) const {
12851295 return __upper_bound (__v, __root (), __end_node ());
@@ -1330,8 +1340,10 @@ public:
13301340 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __copy_assign_alloc (const __tree&, false_type) {}
13311341
13321342private:
1333- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer& __find_leaf_low (__parent_pointer& __parent, const key_type& __v);
1334- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer& __find_leaf_high (__parent_pointer& __parent, const key_type& __v);
1343+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
1344+ __find_leaf_low (__parent_pointer& __parent, const key_type& __v);
1345+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
1346+ __find_leaf_high (__parent_pointer& __parent, const key_type& __v);
13351347 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
13361348 __find_leaf (const_iterator __hint, __parent_pointer& __parent, const key_type& __v);
13371349
@@ -1358,11 +1370,12 @@ private:
13581370 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign_alloc (__tree&, false_type) _NOEXCEPT {}
13591371
13601372 template <class _From , class _ValueT = _Tp, __enable_if_t <__is_tree_value_type<_ValueT>::value, int > = 0 >
1361- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void __assign_value (__get_node_value_type_t <value_type>& __lhs, _From&& __rhs) {
1373+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
1374+ __assign_value (__get_node_value_type_t <value_type>& __lhs, _From&& __rhs) {
13621375 using __key_type = typename _NodeTypes::key_type;
13631376
1364- if (std::is_constant_evaluated ()){
1365- __get_node_value_type_t <value_type> tmp {__rhs.first , __rhs.second };
1377+ if (std::is_constant_evaluated ()) {
1378+ __get_node_value_type_t <value_type> tmp{__rhs.first , __rhs.second };
13661379 // tmp.first = const_cast<__copy_cvref_t<_From, __key_type>&&>(__rhs.first);
13671380 // tmp.second = std::forward<_From>(__rhs).second;
13681381 // __lhs = pair<const int, double>
@@ -1371,7 +1384,7 @@ private:
13711384 // const_cast is not allowed at constexpr time.
13721385 // we get around this by deleting and creating a new node value
13731386 __lhs.~foo_type ();
1374- new (std::addressof (__lhs))(foo_type) (tmp);
1387+ new (std::addressof (__lhs))(foo_type)(tmp);
13751388 // __lhs = std::move(tmp);
13761389 } else {
13771390 // This is technically UB, since the object was constructed as `const`.
@@ -2301,8 +2314,8 @@ __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const {
23012314
23022315template <class _Tp , class _Compare , class _Allocator >
23032316template <class _Key >
2304- typename __tree<_Tp, _Compare, _Allocator>::iterator
2305- _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v, __node_pointer __root, __end_node_pointer __result) {
2317+ typename __tree<_Tp, _Compare, _Allocator>::iterator _LIBCPP_CONSTEXPR_SINCE_CXX26
2318+ __tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v, __node_pointer __root, __end_node_pointer __result) {
23062319 while (__root != nullptr ) {
23072320 if (!value_comp ()(__root->__value_ , __v)) {
23082321 __result = static_cast <__end_node_pointer>(__root);
@@ -2315,7 +2328,8 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>::__lower_bound(c
23152328
23162329template <class _Tp , class _Compare , class _Allocator >
23172330template <class _Key >
2318- _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator __tree<_Tp, _Compare, _Allocator>::__lower_bound(
2331+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator
2332+ __tree<_Tp, _Compare, _Allocator>::__lower_bound(
23192333 const _Key& __v, __node_pointer __root, __end_node_pointer __result) const {
23202334 while (__root != nullptr ) {
23212335 if (!value_comp ()(__root->__value_ , __v)) {
@@ -2343,7 +2357,8 @@ __tree<_Tp, _Compare, _Allocator>::__upper_bound(const _Key& __v, __node_pointer
23432357
23442358template <class _Tp , class _Compare , class _Allocator >
23452359template <class _Key >
2346- _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator __tree<_Tp, _Compare, _Allocator>::__upper_bound(
2360+ _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator
2361+ __tree<_Tp, _Compare, _Allocator>::__upper_bound(
23472362 const _Key& __v, __node_pointer __root, __end_node_pointer __result) const {
23482363 while (__root != nullptr ) {
23492364 if (value_comp ()(__v, __root->__value_ )) {
0 commit comments