@@ -492,8 +492,8 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
492
492
bool _Dummy = true ,
493
493
class = _EnableIfDeleterDefaultConstructible<_Dummy>,
494
494
class = _EnableIfPointerConvertible<_Pp> >
495
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr (_Pp __p ) _NOEXCEPT
496
- : __ptr_(__p ),
495
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr (_Pp __ptr ) _NOEXCEPT
496
+ : __ptr_(__ptr ),
497
497
__deleter_() {}
498
498
499
499
// Private constructor used by make_unique & friends to pass the size that was allocated
@@ -506,37 +506,39 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
506
506
bool _Dummy = true ,
507
507
class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,
508
508
class = _EnableIfPointerConvertible<_Pp> >
509
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (_Pp __p , _LValRefType<_Dummy> __d ) _NOEXCEPT
510
- : __ptr_(__p ),
511
- __deleter_(__d ) {}
509
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (_Pp __ptr , _LValRefType<_Dummy> __deleter ) _NOEXCEPT
510
+ : __ptr_(__ptr ),
511
+ __deleter_(__deleter ) {}
512
512
513
513
template <bool _Dummy = true , class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >
514
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (nullptr_t , _LValRefType<_Dummy> __d ) _NOEXCEPT
514
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (nullptr_t , _LValRefType<_Dummy> __deleter ) _NOEXCEPT
515
515
: __ptr_(nullptr ),
516
- __deleter_(__d ) {}
516
+ __deleter_(__deleter ) {}
517
517
518
518
template <class _Pp ,
519
519
bool _Dummy = true ,
520
520
class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,
521
521
class = _EnableIfPointerConvertible<_Pp> >
522
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (_Pp __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT
523
- : __ptr_(__p),
524
- __deleter_(std::move(__d)) {
522
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
523
+ unique_ptr (_Pp __ptr, _GoodRValRefType<_Dummy> __deleter) _NOEXCEPT
524
+ : __ptr_(__ptr),
525
+ __deleter_ (std::move(__deleter)) {
525
526
static_assert (!is_reference<deleter_type>::value, " rvalue deleter bound to reference" );
526
527
}
527
528
528
529
template <bool _Dummy = true , class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >
529
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (nullptr_t , _GoodRValRefType<_Dummy> __d) _NOEXCEPT
530
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23
531
+ unique_ptr (nullptr_t , _GoodRValRefType<_Dummy> __deleter) _NOEXCEPT
530
532
: __ptr_(nullptr ),
531
- __deleter_(std::move(__d )) {
533
+ __deleter_(std::move(__deleter )) {
532
534
static_assert (!is_reference<deleter_type>::value, " rvalue deleter bound to reference" );
533
535
}
534
536
535
537
template <class _Pp ,
536
538
bool _Dummy = true ,
537
539
class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> >,
538
540
class = _EnableIfPointerConvertible<_Pp> >
539
- _LIBCPP_HIDE_FROM_ABI unique_ptr (_Pp __p , _BadRValRefType<_Dummy> __d ) = delete;
541
+ _LIBCPP_HIDE_FROM_ABI unique_ptr (_Pp __ptr , _BadRValRefType<_Dummy> __deleter ) = delete;
540
542
541
543
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (unique_ptr&& __u) _NOEXCEPT
542
544
: __ptr_(__u.release()),
@@ -608,9 +610,9 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
608
610
}
609
611
610
612
template <class _Pp , __enable_if_t <_CheckArrayPointerConversion<_Pp>::value, int > = 0 >
611
- _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void reset (_Pp __p ) _NOEXCEPT {
613
+ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 void reset (_Pp __ptr ) _NOEXCEPT {
612
614
pointer __tmp = __ptr_;
613
- __ptr_ = __p ;
615
+ __ptr_ = __ptr ;
614
616
__checker_ = _BoundsChecker ();
615
617
if (__tmp)
616
618
__deleter_ (__tmp);
0 commit comments