Skip to content
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

Use move construction in swap implementation #103

Merged
merged 2 commits into from
Nov 24, 2022
Merged

Use move construction in swap implementation #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4fbd1e
Use correct type alias in swap helper function
bobbleclank Feb 13, 2022
f9099b6
Use move instead of copy in swap implementation
bobbleclank Feb 13, 2022
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 include/tl/expected.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1818,12 +1818,12 @@ class expected : private detail::expected_move_assign_base<T, E>,

void swap_where_only_one_has_value_and_t_is_not_void(
expected &rhs, move_constructing_t_can_throw,
t_is_nothrow_move_constructible) {
e_is_nothrow_move_constructible) {
auto temp = std::move(rhs.err());
rhs.err().~unexpected_type();
#ifdef TL_EXPECTED_EXCEPTIONS_ENABLED
try {
::new (rhs.valptr()) T(val());
::new (rhs.valptr()) T(std::move(val()));
val().~T();
::new (errptr()) unexpected_type(std::move(temp));
std::swap(this->m_has_val, rhs.m_has_val);
Expand All @@ -1832,7 +1832,7 @@ class expected : private detail::expected_move_assign_base<T, E>,
throw;
}
#else
::new (rhs.valptr()) T(val());
::new (rhs.valptr()) T(std::move(val()));
val().~T();
::new (errptr()) unexpected_type(std::move(temp));
std::swap(this->m_has_val, rhs.m_has_val);
Expand Down