feedc0de/expected
1
0
Fork 0
forked from TartanLlama/expected
Code Pull Requests Activity

Revert

Browse Source
This commit is contained in:
Simon Brand
2017-12-05 20:21:19 +00:00
parent 4181f524a5
commit 1d3981271f
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
expected.hpp
View File

@@ -612,15 +612,7 @@ struct expected_copy_base<T, E, false> : expected_operations_base<T, E> {
} }
expected_copy_base(expected_copy_base &&rhs) = default; expected_copy_base(expected_copy_base &&rhs) = default;
expected_copy_base &operator=(const expected_copy_base &rhs) { expected_copy_base &operator=(const expected_copy_base &rhs) = default;
if (rhs.has_value()) {
this->construct(rhs.get());
}
else {
this->construct_error(rhs.geterr());
}
return *this;
}
expected_copy_base &operator=(expected_copy_base &&rhs) = default; expected_copy_base &operator=(expected_copy_base &&rhs) = default;
}; };
@@ -721,7 +713,6 @@ struct expected_move_assign_base<T, E, false>
operator=(const expected_move_assign_base &rhs) = default; operator=(const expected_move_assign_base &rhs) = default;
expected_move_assign_base & expected_move_assign_base &
operator=(expected_move_assign_base &&rhs) noexcept( operator=(expected_move_assign_base &&rhs) noexcept(
std::is_nothrow_move_constructible<T>::value std::is_nothrow_move_constructible<T>::value
&&std::is_nothrow_move_assignable<T>::value) { &&std::is_nothrow_move_assignable<T>::value) {