TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-29 17:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed build

Browse Source
This commit is contained in:
Yuri Kovalenko
2020-08-15 23:37:43 +03:00
parent 91a52123d1
commit d3d37ec927
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/tl/optional.hpp
View File

@ -741,8 +741,7 @@ public:
static_assert(detail::is_optional<result>::value, static_assert(detail::is_optional<result>::value,
"F must return an optional"); "F must return an optional");
return has_value() ? detail::invoke(std::forward<F>(f), **this) return has_value() ? detail::invoke(std::forward<F>(f), **this) : result(nullopt);
: result(nullopt);
} }
template <class F> template <class F>
@ -1582,7 +1581,7 @@ public:
static_assert(detail::is_optional<result>::value, static_assert(detail::is_optional<result>::value,
"F must return an optional"); "F must return an optional");
return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) return has_value() ? detail::invoke(std::forward<F>(f), **this)
: result(nullopt); : result(nullopt);
} }
@ -1601,7 +1600,7 @@ public:
static_assert(detail::is_optional<result>::value, static_assert(detail::is_optional<result>::value,
"F must return an optional"); "F must return an optional");
return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) return has_value() ? detail::invoke(std::forward<F>(f), **this)
: result(nullopt); : result(nullopt);
} }
#endif #endif
@ -1624,7 +1623,7 @@ public:
static_assert(detail::is_optional<result>::value, static_assert(detail::is_optional<result>::value,
"F must return an optional"); "F must return an optional");
return has_value() ? detail::invoke(std::forward<F>(f), std::move(**this)) return has_value() ? detail::invoke(std::forward<F>(f), **this)
: result(nullopt); : result(nullopt);
} }
@ -2033,7 +2032,7 @@ public:
static_assert(std::is_move_constructible<T>::value && static_assert(std::is_move_constructible<T>::value &&
std::is_convertible<U &&, T>::value, std::is_convertible<U &&, T>::value,
"T must be move constructible and convertible from U"); "T must be move constructible and convertible from U");
return has_value() ? std::move(**this) : static_cast<T>(std::forward<U>(u)); return has_value() ? **this : static_cast<T>(std::forward<U>(u));
} }
/// Destroys the stored value if one exists, making the optional empty /// Destroys the stored value if one exists, making the optional empty