@@ -492,8 +492,8 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
492492 bool _Dummy = true ,
493493 class = _EnableIfDeleterDefaultConstructible<_Dummy>,
494494 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 ),
497497 __deleter_() {}
498498
499499 // 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>
506506 bool _Dummy = true ,
507507 class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,
508508 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 ) {}
512512
513513 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
515515 : __ptr_(nullptr ),
516- __deleter_(__d ) {}
516+ __deleter_(__deleter ) {}
517517
518518 template <class _Pp ,
519519 bool _Dummy = true ,
520520 class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,
521521 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)) {
525526 static_assert (!is_reference<deleter_type>::value, " rvalue deleter bound to reference" );
526527 }
527528
528529 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
530532 : __ptr_(nullptr ),
531- __deleter_(std::move(__d )) {
533+ __deleter_(std::move(__deleter )) {
532534 static_assert (!is_reference<deleter_type>::value, " rvalue deleter bound to reference" );
533535 }
534536
535537 template <class _Pp ,
536538 bool _Dummy = true ,
537539 class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> >,
538540 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;
540542
541543 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr (unique_ptr&& __u) _NOEXCEPT
542544 : __ptr_(__u.release()),
@@ -608,9 +610,9 @@ class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr<_Tp[], _Dp>
608610 }
609611
610612 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 {
612614 pointer __tmp = __ptr_;
613- __ptr_ = __p ;
615+ __ptr_ = __ptr ;
614616 __checker_ = _BoundsChecker ();
615617 if (__tmp)
616618 __deleter_ (__tmp);
0 commit comments