Skip to content

Implement LWG-3897 inout_ptr will not update raw pointer to null #4186

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
Stephan T. Lavavej (StephanTLavavej) merged 2 commits into from
Nov 17, 2023
Merged

Implement LWG-3897 inout_ptr will not update raw pointer to null #4186

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
9ddc40f
Implement LWG-3897 `inout_ptr` will not update raw pointer to null
frederick-vs-ja Nov 13, 2023
c8f6d03
Code review feedback: Simplify control flow.
StephanTLavavej Nov 13, 2023
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
6 changes: 3 additions & 3 deletions stl/inc/memory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,10 +4244,10 @@ public:
~inout_ptr_t() {
if constexpr (!is_pointer_v<_SmartPtr>) {
_Smart_ptr.release();
}

if (!_Get_ptr()) {
return;
if (!_Get_ptr()) {
return;
}
}

_STD apply(
Expand Down
13 changes: 13 additions & 0 deletions tests/std/tests/P1132R7_out_ptr/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@ void test_raw_ptr() {

assert(*int_ptr == 15);
}
// LWG-3897 inout_ptr will not update raw pointer to null
{
const auto delete_nullify = [](int** ptr) {
delete *ptr;
*ptr = nullptr;
};

int* ptr_allocated = new int{};

delete_nullify(inout_ptr(ptr_allocated));

assert(ptr_allocated == nullptr);
}
}

void test_shared_ptr() {
Expand Down