Skip to content

Fix missing _CONSTEXPR20_CONTAINER on _Alloc_temporary #1962

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 1 commit into from
Jun 12, 2021
+6 −2
Merged

Fix missing _CONSTEXPR20_CONTAINER on _Alloc_temporary #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions stl/inc/xmemory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ struct _Alloc_temporary {
};

template <class... _Args>
explicit _Alloc_temporary(_Alloc& _Al_, _Args&&... _Vals) noexcept(
_CONSTEXPR20_CONTAINER explicit _Alloc_temporary(_Alloc& _Al_, _Args&&... _Vals) noexcept(
noexcept(_Traits::construct(_Al_, _STD addressof(_Storage._Value), _STD forward<_Args>(_Vals)...)))
: _Al(_Al_) {
_Traits::construct(_Al, _STD addressof(_Storage._Value), _STD forward<_Args>(_Vals)...);
Expand All @@ -1917,7 +1917,7 @@ struct _Alloc_temporary {
_Alloc_temporary(const _Alloc_temporary&) = delete;
_Alloc_temporary& operator=(const _Alloc_temporary&) = delete;

~_Alloc_temporary() {
_CONSTEXPR20_CONTAINER ~_Alloc_temporary() {
_Traits::destroy(_Al, _STD addressof(_Storage._Value));
}
};
Expand Down
4 changes: 4 additions & 0 deletions tests/std/tests/P1004R2_constexpr_vector/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ _CONSTEXPR20_CONTAINER bool test_interface() {

emplaced.erase(emplaced.begin(), emplaced.begin() + 2);
assert(emplaced.size() == 23);

emplaced.emplace(emplaced.cbegin(), 42);
assert(emplaced.size() == 24);
assert(emplaced.front() == 42);
#endif // __EDG__
}

Expand Down