forked from boostorg/system
Support result<void> & fv, where fv returns void. Refs #119.
This commit is contained in:
@@ -1192,7 +1192,8 @@ result<U, E> operator&( result<T, E>&& r, F&& f )
|
||||
|
||||
template<class E, class F,
|
||||
class U = decltype( std::declval<F>()() ),
|
||||
class En = typename std::enable_if<!detail::is_result<U>::value>::type
|
||||
class En1 = typename std::enable_if<!detail::is_result<U>::value>::type,
|
||||
class En2 = typename std::enable_if<!std::is_void<U>::value>::type
|
||||
>
|
||||
result<U, E> operator&( result<void, E> const& r, F&& f )
|
||||
{
|
||||
@@ -1206,6 +1207,23 @@ result<U, E> operator&( result<void, E> const& r, F&& f )
|
||||
}
|
||||
}
|
||||
|
||||
template<class E, class F,
|
||||
class U = decltype( std::declval<F>()() ),
|
||||
class En = typename std::enable_if<std::is_void<U>::value>::type
|
||||
>
|
||||
result<U, E> operator&( result<void, E> const& r, F&& f )
|
||||
{
|
||||
if( r.has_error() )
|
||||
{
|
||||
return r.error();
|
||||
}
|
||||
else
|
||||
{
|
||||
std::forward<F>( f )();
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
// result & unary-returning-result
|
||||
|
||||
template<class T, class E, class F,
|
||||
|
||||
Reference in New Issue
Block a user