Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions include/tl/expected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@ template <class T, class E, class U>
using expected_enable_forward_value = detail::enable_if_t<
std::is_constructible<T, U &&>::value &&
!std::is_same<detail::decay_t<U>, in_place_t>::value &&
!std::is_same<expected<T, E>, detail::decay_t<U>>::value &&
!std::is_same<unexpected<E>, detail::decay_t<U>>::value>;
!std::is_base_of<expected<T, E>, detail::decay_t<U>>::value &&
!std::is_base_of<unexpected<E>, detail::decay_t<U>>::value>;

template <class T, class E, class U, class G, class UR, class GR>
using expected_enable_from_other = detail::enable_if_t<
Expand Down
53 changes: 53 additions & 0 deletions tests/derived.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#include <catch2/catch.hpp>
#include <tl/expected.hpp>

namespace tl {
template <typename T, typename E>
class derived : public tl::expected<T,E>
{
public:
derived() : tl::expected<T,E>() {}
template <typename G>
derived(unexpected<G> const &e) : tl::expected<T,E>(e) {}
derived(const derived& d) : tl::expected<T,E>(d) {}
derived(derived&& d) : tl::expected<T,E>(std::move(d)) {}
// TODO: Add overloads for other constructors
};
}

TEST_CASE("Derived constructors", "[constructors.derived]") {
{
tl::derived<int,int> e;
REQUIRE(e);
REQUIRE(e == 0);
}

// Construct from unexpected
{
tl::derived<int,int> e = tl::make_unexpected(0);
REQUIRE(!e);
REQUIRE(e.error() == 0);
}

// Copy construct
{
tl::derived<bool, int> e;
REQUIRE(e);
REQUIRE(!e.value());

tl::derived<bool, int> e_copy(e);
REQUIRE(e_copy);
REQUIRE(e_copy.value() == e.value());
}

// Move construct
{
tl::derived<bool, int> e;
REQUIRE(e);
REQUIRE(e == false);

tl::derived<bool, int> e_move(std::move(e));
REQUIRE(e_move);
REQUIRE(!e_move.value());
}
}