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

Move the error value when throwing an exception in .value rval overloads (#62)

Browse Source 
* Move the error value when throwing an exception in .value rval overloads
Fixes #61

* Bump version
This commit is contained in:
Simon Brand
2019-07-10 09:26:02 +01:00
committed by GitHub
parent bcdc78bf8e
commit 6fe2af5191
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/tl/expected.hpp
View File

@ -18,7 +18,7 @@
#define TL_EXPECTED_VERSION_MAJOR 1 #define TL_EXPECTED_VERSION_MAJOR 1
#define TL_EXPECTED_VERSION_MINOR 0 #define TL_EXPECTED_VERSION_MINOR 0
#define TL_EXPECTED_VERSION_PATCH 0 #define TL_EXPECTED_VERSION_PATCH 1
#include <exception> #include <exception>
#include <functional> #include <functional>
@ -1907,14 +1907,14 @@ public:
detail::enable_if_t<!std::is_void<U>::value> * = nullptr> detail::enable_if_t<!std::is_void<U>::value> * = nullptr>
TL_EXPECTED_11_CONSTEXPR const U &&value() const && { TL_EXPECTED_11_CONSTEXPR const U &&value() const && {
if (!has_value()) if (!has_value())
detail::throw_exception(bad_expected_access<E>(err().value())); detail::throw_exception(bad_expected_access<E>(std::move(err()).value()));
return std::move(val()); return std::move(val());
} }
template <class U = T, template <class U = T,
detail::enable_if_t<!std::is_void<U>::value> * = nullptr> detail::enable_if_t<!std::is_void<U>::value> * = nullptr>
TL_EXPECTED_11_CONSTEXPR U &&value() && { TL_EXPECTED_11_CONSTEXPR U &&value() && {
if (!has_value()) if (!has_value())
detail::throw_exception(bad_expected_access<E>(err().value())); detail::throw_exception(bad_expected_access<E>(std::move(err()).value()));
return std::move(val()); return std::move(val());
} }

11
tests/issues.cpp
View File

@ -126,4 +126,13 @@ TEST_CASE("Issue 49", "[issues.49]") {
auto m = test(10) auto m = test(10)
.and_then(test2); .and_then(test2);
} }
#endif #endif
tl::expected<int, std::unique_ptr<std::string>> func()
{
return 1;
}
TEST_CASE("Issue 61", "[issues.61]") {
REQUIRE(func().value() == 1);
}