From b4f9e3d224a2ee2550fa1665935f922a8816a981 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Wed, 29 Nov 2017 13:53:45 +0100 Subject: [PATCH 1/2] replace optional by expected in readme license --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 072ddd0..529a3e3 100644 --- a/README.md +++ b/README.md @@ -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. From e0d5b0bf19199d077eada80dc93247210f817b9e Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Fri, 1 Dec 2017 12:23:52 +0000 Subject: [PATCH 2/2] Remove bad move --- expected.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/expected.hpp b/expected.hpp index c1cd6cd..03a53f4 100644 --- a/expected.hpp +++ b/expected.hpp @@ -680,7 +680,7 @@ struct expected_move_assign_base operator=(const expected_move_assign_base &rhs) noexcept( std::is_nothrow_move_constructible::value &&std::is_nothrow_move_assignable::value) { - this->assign(std::move(rhs)); + this->assign(rhs); return *this; } expected_move_assign_base &