coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2026-02-09 03:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the MSVC/Clang build even more

Browse Source
This commit is contained in:
Denis Blank 2018-11-25 18:01:15 +01:00
parent 2a80649084
commit 5354d3512e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/continuable/continuable-result.hpp
View File

@ -95,22 +95,17 @@ class result {
detail::container::flat_variant<value_t, exception_t> variant_; detail::container::flat_variant<value_t, exception_t> variant_;
public: public:
template <typename A = detail::traits::identity<>, result() = default;
// I know this is a little bit hacky but it's a working version result(result const&) = default;
// of a default constructor that is not present when the class is result(result&&) = default;
// instantiated with zero arguments.
std::enable_if_t<((sizeof(A) * 0 + sizeof...(T)) > 0)>* = nullptr,
std::enable_if_t<
std::is_same<A, detail::traits::identity<>>::value>* = nullptr>
explicit result(A = {}) {
}
explicit result(result const&) = default;
explicit result(result&&) = default;
result& operator=(result const&) = default; result& operator=(result const&) = default;
result& operator=(result&&) = default; result& operator=(result&&) = default;
~result() = default; ~result() = default;
explicit result(T... values) : variant_(trait::wrap(std::move(values)...)) { template <typename... Args,
decltype(trait::wrap(std::declval<Args>()...))* = nullptr>
explicit result(Args&&... values)
: variant_(trait::wrap(std::forward<Args>(values)...)) {
} }
explicit result(exception_t exception) : variant_(std::move(exception)) { explicit result(exception_t exception) : variant_(std::move(exception)) {
} }
@ -192,7 +187,7 @@ template <>
struct is_result<exceptional_result> : std::true_type {}; struct is_result<exceptional_result> : std::true_type {};
template <typename... T> template <typename... T>
constexpr auto make_result(T&&... values) { auto make_result(T&&... values) {
return result<detail::traits::unrefcv_t<T>...>(std::forward<T>(values)...); return result<detail::traits::unrefcv_t<T>...>(std::forward<T>(values)...);
} }

3
include/continuable/detail/utility/result-trait.hpp
View File

@ -61,7 +61,8 @@ template <typename First, typename Second, typename... Rest>
struct result_trait<First, Second, Rest...> { struct result_trait<First, Second, Rest...> {
using value_t = std::tuple<First, Second, Rest...>; using value_t = std::tuple<First, Second, Rest...>;
static auto wrap(First first, Second second, Rest... rest) { static std::tuple<First, Second, Rest...> wrap(First first, Second second,
Rest... rest) {
return std::make_tuple(std::move(first), std::move(second), return std::make_tuple(std::move(first), std::move(second),
std::move(rest)...); std::move(rest)...);
} }

3
test/unit-test/single/test-continuable-result.cpp
View File

@ -29,6 +29,7 @@
using cti::exception_t; using cti::exception_t;
using cti::result; using cti::result;
using cti::make_result;
static int const CANARY = 373671; static int const CANARY = 373671;
@ -67,6 +68,8 @@ TYPED_TEST(result_all_tests, is_default_constructible) {
result<> e1; result<> e1;
result<int> e2; result<int> e2;
result<int, int> e3; result<int, int> e3;
auto empty = make_result();
} }
TYPED_TEST(result_all_tests, can_carry_errors) { TYPED_TEST(result_all_tests, can_carry_errors) {