Merge branch 'master' of github.com:TartanLlama/expected

This commit is contained in:
Simon Brand
2017-12-03 08:25:28 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -86,4 +86,4 @@ Requires [Catch](https://github.com/philsquared/Catch) for testing. This is bund
[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)]("http://creativecommons.org/publicdomain/zero/1.0/")
To the extent possible under law, [Simon Brand](https://twitter.com/TartanLlama) has waived all copyright and related or neighboring rights to the `optional` library. This work is published from: United Kingdom.
To the extent possible under law, [Simon Brand](https://twitter.com/TartanLlama) has waived all copyright and related or neighboring rights to the `expected` library. This work is published from: United Kingdom.

View File

@@ -705,7 +705,7 @@ struct expected_move_assign_base<T, E, false>
operator=(const expected_move_assign_base &rhs) noexcept(
std::is_nothrow_move_constructible<T>::value
&&std::is_nothrow_move_assignable<T>::value) {
this->assign(std::move(rhs));
this->assign(rhs);
return *this;
}
expected_move_assign_base &