@@ -282,7 +282,6 @@ struct __forward_node_traits {
282
282
typedef _NodePtr __node_pointer;
283
283
typedef __forward_begin_node<_NodePtr> __begin_node;
284
284
typedef __rebind_pointer_t <_NodePtr, __begin_node> __begin_node_pointer;
285
- typedef __rebind_pointer_t <_NodePtr, void > __void_pointer;
286
285
287
286
// TODO(LLVM 22): Remove this check
288
287
# ifndef _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB
@@ -294,10 +293,6 @@ struct __forward_node_traits {
294
293
"is being broken between LLVM 19 and LLVM 20. If you don't care about your ABI being broken, define "
295
294
"the _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB macro to silence this diagnostic.");
296
295
# endif
297
-
298
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI static __begin_node_pointer __as_iter_node (__node_pointer __p) {
299
- return std::__static_fancy_pointer_cast<__begin_node_pointer>(__p);
300
- }
301
296
};
302
297
303
298
template <class _NodePtr >
@@ -309,10 +304,6 @@ struct __forward_begin_node {
309
304
310
305
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_begin_node () : __next_(nullptr ) {}
311
306
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_begin_node (pointer __n) : __next_(__n) {}
312
-
313
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __next_as_begin () const {
314
- return std::__static_fancy_pointer_cast<__begin_node_pointer>(__next_);
315
- }
316
307
};
317
308
318
309
template <class _Tp , class _VoidPtr >
@@ -361,23 +352,17 @@ class __forward_list_iterator {
361
352
typedef typename __traits::__begin_node __begin_node_type;
362
353
typedef typename __traits::__node_pointer __node_pointer;
363
354
typedef typename __traits::__begin_node_pointer __begin_node_pointer;
364
- typedef typename __traits::__void_pointer __void_pointer;
365
355
366
356
__begin_node_pointer __ptr_;
367
357
368
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __get_begin () const { return __ptr_; }
369
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __node_pointer __get_unsafe_node_pointer () const {
370
- return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
371
- }
372
-
373
358
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator (nullptr_t ) _NOEXCEPT
374
359
: __ptr_(nullptr ) {}
375
360
376
361
_LIBCPP_CONSTEXPR_SINCE_CXX26
377
362
_LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator (__begin_node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
378
363
379
364
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_iterator (__node_pointer __p) _NOEXCEPT
380
- : __ptr_(__traits::__as_iter_node (__p)) {}
365
+ : __ptr_(std::__static_fancy_pointer_cast<__begin_node_pointer> (__p)) {}
381
366
382
367
template <class , class >
383
368
friend class forward_list ;
@@ -394,14 +379,14 @@ public:
394
379
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator () _NOEXCEPT : __ptr_(nullptr ) {}
395
380
396
381
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI reference operator *() const {
397
- return __get_unsafe_node_pointer ( )->__get_value ();
382
+ return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_ )->__get_value ();
398
383
}
399
384
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI pointer operator ->() const {
400
- return pointer_traits<pointer>::pointer_to (__get_unsafe_node_pointer ( )->__get_value ());
385
+ return pointer_traits<pointer>::pointer_to (std::__static_fancy_pointer_cast<__node_pointer>(__ptr_ )->__get_value ());
401
386
}
402
387
403
388
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator& operator ++() {
404
- __ptr_ = __traits::__as_iter_node (__ptr_->__next_ );
389
+ __ptr_ = std::__static_fancy_pointer_cast<__begin_node_pointer> (__ptr_->__next_ );
405
390
return *this ;
406
391
}
407
392
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_iterator operator ++(int ) {
@@ -430,15 +415,9 @@ class __forward_list_const_iterator {
430
415
typedef typename __traits::__begin_node __begin_node_type;
431
416
typedef typename __traits::__node_pointer __node_pointer;
432
417
typedef typename __traits::__begin_node_pointer __begin_node_pointer;
433
- typedef typename __traits::__void_pointer __void_pointer;
434
418
435
419
__begin_node_pointer __ptr_;
436
420
437
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __begin_node_pointer __get_begin () const { return __ptr_; }
438
- _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __node_pointer __get_unsafe_node_pointer () const {
439
- return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
440
- }
441
-
442
421
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit __forward_list_const_iterator (nullptr_t ) _NOEXCEPT
443
422
: __ptr_(nullptr ) {}
444
423
@@ -447,7 +426,7 @@ class __forward_list_const_iterator {
447
426
448
427
_LIBCPP_CONSTEXPR_SINCE_CXX26
449
428
_LIBCPP_HIDE_FROM_ABI explicit __forward_list_const_iterator (__node_pointer __p) _NOEXCEPT
450
- : __ptr_(__traits::__as_iter_node (__p)) {}
429
+ : __ptr_(std::__static_fancy_pointer_cast<__begin_node_pointer> (__p)) {}
451
430
452
431
template <class , class >
453
432
friend class forward_list ;
@@ -464,14 +443,14 @@ public:
464
443
__forward_list_const_iterator (__forward_list_iterator<__node_pointer> __p) _NOEXCEPT : __ptr_(__p.__ptr_) {}
465
444
466
445
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI reference operator *() const {
467
- return __get_unsafe_node_pointer ( )->__get_value ();
446
+ return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_ )->__get_value ();
468
447
}
469
448
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI pointer operator ->() const {
470
- return pointer_traits<pointer>::pointer_to (__get_unsafe_node_pointer ( )->__get_value ());
449
+ return pointer_traits<pointer>::pointer_to (std::__static_fancy_pointer_cast<__node_pointer>(__ptr_ )->__get_value ());
471
450
}
472
451
473
452
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_const_iterator& operator ++() {
474
- __ptr_ = __traits::__as_iter_node (__ptr_->__next_ );
453
+ __ptr_ = std::__static_fancy_pointer_cast<__begin_node_pointer> (__ptr_->__next_ );
475
454
return *this ;
476
455
}
477
456
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI __forward_list_const_iterator operator ++(int ) {
@@ -963,7 +942,8 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 inline forward_list<_Tp, _Alloc>::forward_list(con
963
942
template <class _Tp , class _Alloc >
964
943
_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n) {
965
944
if (__n > 0 ) {
966
- for (__begin_node_pointer __p = __base::__before_begin (); __n > 0 ; --__n, __p = __p->__next_as_begin ()) {
945
+ for (__begin_node_pointer __p = __base::__before_begin (); __n > 0 ;
946
+ --__n, __p = std::__static_fancy_pointer_cast<__begin_node_pointer>(__p->__next_ )) {
967
947
__p->__next_ = this ->__create_node (/* next = */ nullptr );
968
948
}
969
949
}
@@ -974,7 +954,8 @@ template <class _Tp, class _Alloc>
974
954
_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __base_alloc)
975
955
: __base(__base_alloc) {
976
956
if (__n > 0 ) {
977
- for (__begin_node_pointer __p = __base::__before_begin (); __n > 0 ; --__n, __p = __p->__next_as_begin ()) {
957
+ for (__begin_node_pointer __p = __base::__before_begin (); __n > 0 ;
958
+ --__n, __p = std::__static_fancy_pointer_cast<__begin_node_pointer>(__p->__next_ )) {
978
959
__p->__next_ = this ->__create_node (/* next = */ nullptr );
979
960
}
980
961
}
@@ -1167,15 +1148,15 @@ template <class _Tp, class _Alloc>
1167
1148
template <class ... _Args>
1168
1149
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1169
1150
forward_list<_Tp, _Alloc>::emplace_after(const_iterator __p, _Args&&... __args) {
1170
- __begin_node_pointer const __r = __p.__get_begin () ;
1151
+ __begin_node_pointer const __r = __p.__ptr_ ;
1171
1152
__r->__next_ = this ->__create_node (/* next = */ __r->__next_ , std::forward<_Args>(__args)...);
1172
1153
return iterator (__r->__next_ );
1173
1154
}
1174
1155
1175
1156
template <class _Tp , class _Alloc >
1176
1157
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1177
1158
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v) {
1178
- __begin_node_pointer const __r = __p.__get_begin () ;
1159
+ __begin_node_pointer const __r = __p.__ptr_ ;
1179
1160
__r->__next_ = this ->__create_node (/* next = */ __r->__next_ , std::move (__v));
1180
1161
return iterator (__r->__next_ );
1181
1162
}
@@ -1185,7 +1166,7 @@ forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v) {
1185
1166
template <class _Tp , class _Alloc >
1186
1167
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1187
1168
forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, const value_type& __v) {
1188
- __begin_node_pointer const __r = __p.__get_begin () ;
1169
+ __begin_node_pointer const __r = __p.__ptr_ ;
1189
1170
__r->__next_ = this ->__create_node (/* next = */ __r->__next_ , __v);
1190
1171
return iterator (__r->__next_ );
1191
1172
}
@@ -1194,7 +1175,7 @@ template <class _Tp, class _Alloc>
1194
1175
template <class ... _Args>
1195
1176
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1196
1177
forward_list<_Tp, _Alloc>::__insert_after(const_iterator __p, size_type __n, _Args&&... __args) {
1197
- __begin_node_pointer __r = __p.__get_begin () ;
1178
+ __begin_node_pointer __r = __p.__ptr_ ;
1198
1179
if (__n > 0 ) {
1199
1180
__node_pointer __first = this ->__create_node (/* next = */ nullptr , std::forward<_Args>(__args)...);
1200
1181
__node_pointer __last = __first;
@@ -1216,7 +1197,7 @@ forward_list<_Tp, _Alloc>::__insert_after(const_iterator __p, size_type __n, _Ar
1216
1197
# endif // _LIBCPP_HAS_EXCEPTIONS
1217
1198
__last->__next_ = __r->__next_ ;
1218
1199
__r->__next_ = __first;
1219
- __r = __forward_node_traits<__node_pointer>:: __as_iter_node (__last);
1200
+ __r = std::__static_fancy_pointer_cast<__begin_node_pointer> (__last);
1220
1201
}
1221
1202
return iterator (__r);
1222
1203
}
@@ -1232,7 +1213,7 @@ template <class _Tp, class _Alloc>
1232
1213
template <class _InputIterator , class _Sentinel >
1233
1214
_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI typename forward_list<_Tp, _Alloc>::iterator
1234
1215
forward_list<_Tp, _Alloc>::__insert_after_with_sentinel (const_iterator __p, _InputIterator __f, _Sentinel __l) {
1235
- __begin_node_pointer __r = __p.__get_begin () ;
1216
+ __begin_node_pointer __r = __p.__ptr_ ;
1236
1217
1237
1218
if (__f != __l) {
1238
1219
__node_pointer __first = this ->__create_node (/* next = */ nullptr , *__f);
@@ -1257,7 +1238,7 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
1257
1238
1258
1239
__last->__next_ = __r->__next_ ;
1259
1240
__r->__next_ = __first;
1260
- __r = __forward_node_traits<__node_pointer>:: __as_iter_node (__last);
1241
+ __r = std::__static_fancy_pointer_cast<__begin_node_pointer> (__last);
1261
1242
}
1262
1243
1263
1244
return iterator (__r);
@@ -1266,7 +1247,7 @@ forward_list<_Tp, _Alloc>::__insert_after_with_sentinel(const_iterator __p, _Inp
1266
1247
template <class _Tp , class _Alloc >
1267
1248
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1268
1249
forward_list<_Tp, _Alloc>::erase_after (const_iterator __f) {
1269
- __begin_node_pointer __p = __f.__get_begin () ;
1250
+ __begin_node_pointer __p = __f.__ptr_ ;
1270
1251
__node_pointer __n = __p->__next_ ;
1271
1252
__p->__next_ = __n->__next_ ;
1272
1253
this ->__delete_node (__n);
@@ -1276,9 +1257,9 @@ forward_list<_Tp, _Alloc>::erase_after(const_iterator __f) {
1276
1257
template <class _Tp , class _Alloc >
1277
1258
_LIBCPP_CONSTEXPR_SINCE_CXX26 typename forward_list<_Tp, _Alloc>::iterator
1278
1259
forward_list<_Tp, _Alloc>::erase_after (const_iterator __f, const_iterator __l) {
1279
- __node_pointer __e = __l.__get_unsafe_node_pointer ( );
1260
+ __node_pointer __e = std::__static_fancy_pointer_cast<__node_pointer>( __l.__ptr_ );
1280
1261
if (__f != __l) {
1281
- __begin_node_pointer __bp = __f.__get_begin () ;
1262
+ __begin_node_pointer __bp = __f.__ptr_ ;
1282
1263
1283
1264
__node_pointer __n = __bp->__next_ ;
1284
1265
if (__n != __e) {
@@ -1324,13 +1305,13 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::resize(size_type _
1324
1305
template <class _Tp , class _Alloc >
1325
1306
_LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::splice_after (const_iterator __p, forward_list& __x) {
1326
1307
if (!__x.empty ()) {
1327
- if (__p.__get_begin () ->__next_ != nullptr ) {
1308
+ if (__p.__ptr_ ->__next_ != nullptr ) {
1328
1309
const_iterator __lm1 = __x.before_begin ();
1329
- while (__lm1.__get_begin () ->__next_ != nullptr )
1310
+ while (__lm1.__ptr_ ->__next_ != nullptr )
1330
1311
++__lm1;
1331
- __lm1.__get_begin () ->__next_ = __p.__get_begin () ->__next_ ;
1312
+ __lm1.__ptr_ ->__next_ = __p.__ptr_ ->__next_ ;
1332
1313
}
1333
- __p.__get_begin () ->__next_ = __x.__before_begin ()->__next_ ;
1314
+ __p.__ptr_ ->__next_ = __x.__before_begin ()->__next_ ;
1334
1315
__x.__before_begin ()->__next_ = nullptr ;
1335
1316
}
1336
1317
}
@@ -1340,9 +1321,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void
1340
1321
forward_list<_Tp, _Alloc>::splice_after (const_iterator __p, forward_list& /* __other*/ , const_iterator __i) {
1341
1322
const_iterator __lm1 = std::next (__i);
1342
1323
if (__p != __i && __p != __lm1) {
1343
- __i.__get_begin () ->__next_ = __lm1.__get_begin () ->__next_ ;
1344
- __lm1.__get_begin () ->__next_ = __p.__get_begin () ->__next_ ;
1345
- __p.__get_begin () ->__next_ = __lm1.__get_unsafe_node_pointer ( );
1324
+ __i.__ptr_ ->__next_ = __lm1.__ptr_ ->__next_ ;
1325
+ __lm1.__ptr_ ->__next_ = __p.__ptr_ ->__next_ ;
1326
+ __p.__ptr_ ->__next_ = std::__static_fancy_pointer_cast<__node_pointer>( __lm1.__ptr_ );
1346
1327
}
1347
1328
}
1348
1329
@@ -1351,12 +1332,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::splice_after(
1351
1332
const_iterator __p, forward_list& /* __other*/ , const_iterator __f, const_iterator __l) {
1352
1333
if (__f != __l && __p != __f) {
1353
1334
const_iterator __lm1 = __f;
1354
- while (__lm1.__get_begin () ->__next_ != __l.__get_begin () )
1335
+ while (__lm1.__ptr_ ->__next_ != __l.__ptr_ )
1355
1336
++__lm1;
1356
1337
if (__f != __lm1) {
1357
- __lm1.__get_begin () ->__next_ = __p.__get_begin () ->__next_ ;
1358
- __p.__get_begin () ->__next_ = __f.__get_begin () ->__next_ ;
1359
- __f.__get_begin () ->__next_ = __l.__get_unsafe_node_pointer ( );
1338
+ __lm1.__ptr_ ->__next_ = __p.__ptr_ ->__next_ ;
1339
+ __p.__ptr_ ->__next_ = __f.__ptr_ ->__next_ ;
1340
+ __f.__ptr_ ->__next_ = std::__static_fancy_pointer_cast<__node_pointer>( __l.__ptr_ );
1360
1341
}
1361
1342
}
1362
1343
}
@@ -1385,8 +1366,8 @@ forward_list<_Tp, _Alloc>::remove(const value_type& __v) {
1385
1366
forward_list<_Tp, _Alloc> __deleted_nodes (get_allocator ()); // collect the nodes we're removing
1386
1367
typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0 ;
1387
1368
const iterator __e = end ();
1388
- for (iterator __i = before_begin (); __i.__get_begin () ->__next_ != nullptr ;) {
1389
- if (__i.__get_begin () ->__next_ ->__get_value () == __v) {
1369
+ for (iterator __i = before_begin (); __i.__ptr_ ->__next_ != nullptr ;) {
1370
+ if (__i.__ptr_ ->__next_ ->__get_value () == __v) {
1390
1371
++__count_removed;
1391
1372
iterator __j = std::next (__i, 2 );
1392
1373
for (; __j != __e && *__j == __v; ++__j)
@@ -1409,8 +1390,8 @@ forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred) {
1409
1390
forward_list<_Tp, _Alloc> __deleted_nodes (get_allocator ()); // collect the nodes we're removing
1410
1391
typename forward_list<_Tp, _Alloc>::size_type __count_removed = 0 ;
1411
1392
const iterator __e = end ();
1412
- for (iterator __i = before_begin (); __i.__get_begin () ->__next_ != nullptr ;) {
1413
- if (__pred (__i.__get_begin () ->__next_ ->__get_value ())) {
1393
+ for (iterator __i = before_begin (); __i.__ptr_ ->__next_ != nullptr ;) {
1394
+ if (__pred (__i.__ptr_ ->__next_ ->__get_value ())) {
1414
1395
++__count_removed;
1415
1396
iterator __j = std::next (__i, 2 );
1416
1397
for (; __j != __e && __pred (*__j); ++__j)
@@ -1436,7 +1417,7 @@ forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred) {
1436
1417
iterator __j = std::next (__i);
1437
1418
for (; __j != __e && __binary_pred (*__i, *__j); ++__j)
1438
1419
++__count_removed;
1439
- if (__i.__get_begin () ->__next_ != __j.__get_unsafe_node_pointer ( ))
1420
+ if (__i.__ptr_ ->__next_ != std::__static_fancy_pointer_cast<__node_pointer>( __j.__ptr_ ))
1440
1421
__deleted_nodes.splice_after (__deleted_nodes.before_begin (), *this , __i, __j);
1441
1422
__i = __j;
1442
1423
}
@@ -1516,7 +1497,7 @@ forward_list<_Tp, _Alloc>::__sort(__node_pointer __f1, difference_type __sz, _Co
1516
1497
}
1517
1498
difference_type __sz1 = __sz / 2 ;
1518
1499
difference_type __sz2 = __sz - __sz1;
1519
- __node_pointer __t = std::next (iterator (__f1), __sz1 - 1 ).__get_unsafe_node_pointer ( );
1500
+ __node_pointer __t = std::__static_fancy_pointer_cast<__node_pointer>( std:: next (iterator (__f1), __sz1 - 1 ).__ptr_ );
1520
1501
__node_pointer __f2 = __t ->__next_ ;
1521
1502
__t ->__next_ = nullptr ;
1522
1503
return __merge (__sort (__f1, __sz1, __comp), __sort (__f2, __sz2, __comp), __comp);
0 commit comments