maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libc++] NFCI: Return pointer instead of reference from __shared_ptr_emplace helper method 

This makes __get_alloc consistent with __get_elem, and will reduce the
diff required to implement P0674R1.
This commit is contained in:
Louis Dionne 2020-12-14 17:40:56 -05:00
parent d399f870b5
commit 3b7280f5e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcxx/include/memory
View File

@ -2594,7 +2594,7 @@ struct __shared_ptr_emplace
_Tp* __get_elem() _NOEXCEPT { return _VSTD::addressof(__data_.second()); } _Tp* __get_elem() _NOEXCEPT { return _VSTD::addressof(__data_.second()); }
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI
_Alloc& __get_alloc() _NOEXCEPT { return __data_.first(); } _Alloc* __get_alloc() _NOEXCEPT { return _VSTD::addressof(__data_.first()); }
private: private:
virtual void __on_zero_shared() _NOEXCEPT { virtual void __on_zero_shared() _NOEXCEPT {
@ -2604,8 +2604,8 @@ private:
virtual void __on_zero_shared_weak() _NOEXCEPT { virtual void __on_zero_shared_weak() _NOEXCEPT {
using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type; using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type;
using _ControlBlockPointer = typename allocator_traits<_ControlBlockAlloc>::pointer; using _ControlBlockPointer = typename allocator_traits<_ControlBlockAlloc>::pointer;
_ControlBlockAlloc __tmp(__get_alloc()); _ControlBlockAlloc __tmp(*__get_alloc());
__get_alloc().~_Alloc(); __get_alloc()->~_Alloc();
allocator_traits<_ControlBlockAlloc>::deallocate(__tmp, allocator_traits<_ControlBlockAlloc>::deallocate(__tmp,
pointer_traits<_ControlBlockPointer>::pointer_to(*this), 1); pointer_traits<_ControlBlockPointer>::pointer_to(*this), 1);
} }