Skip to content

Implement LWG-3548 shared_ptr construction from unique_ptr should move (not copy) the deleter #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Implement LWG-3548 shared_ptr construction from unique_ptr should move (not copy) the deleter #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
647baf8
Implement LWG-3548
AdamBucior Jun 13, 2021
4640eab
Add test coverage.
StephanTLavavej Jun 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion stl/inc/memory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,8 @@ public:

if (_Fancy) {
const _Raw_t _Raw = _Fancy;
const auto _Rx = new _Ref_count_resource<_Fancy_t, _Deleter_t>(_Fancy, _Other.get_deleter());
const auto _Rx =
new _Ref_count_resource<_Fancy_t, _Deleter_t>(_Fancy, _STD forward<_Dx>(_Other.get_deleter()));
_Set_ptr_rep_and_enable_shared(_Raw, _Rx);
_Other.release();
}
Expand Down
8 changes: 8 additions & 0 deletions tests/std/tests/Dev10_722102_shared_ptr_nullptr/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@ namespace unique_ptr_ {
assert(*ptr.ptr_ == 42);
*ptr.ptr_ = 13;
}

// Also test LWG-3548 "shared_ptr construction from unique_ptr should move (not copy) the deleter".
fancy_deleter() = default;
fancy_deleter(fancy_deleter&&) = default;

fancy_deleter(const fancy_deleter&) = delete;
fancy_deleter& operator=(fancy_deleter&&) = delete;
fancy_deleter& operator=(const fancy_deleter&) = delete;
};

template <class>
Expand Down