Enable result<void> &= fr. Refs #117.

This commit is contained in:
Peter Dimov
2024-02-01 02:39:31 +02:00
parent cedf6eb581
commit c7a0ce3349
2 changed files with 39 additions and 0 deletions

View File

@ -1209,6 +1209,22 @@ result<T, E>& operator&=( result<T, E>& r, F&& f )
return r;
}
template<class E, class F,
class U = decltype( std::declval<F>()() ),
class En1 = typename std::enable_if<detail::is_result<U>::value>::type,
class En2 = typename std::enable_if<std::is_void<typename U::value_type>::value>::type,
class En3 = typename std::enable_if<std::is_convertible<typename U::error_type, E>::value>::type
>
result<void, E>& operator&=( result<void, E>& r, F&& f )
{
if( r )
{
r = std::forward<F>( f )();
}
return r;
}
} // namespace system
} // namespace boost

View File

@ -80,6 +80,16 @@ result<int&, E2> fri2( int& )
return E2();
}
result<void, E2> fv()
{
return {};
}
result<void, E2> fv2()
{
return E2();
}
int main()
{
{
@ -122,5 +132,18 @@ int main()
BOOST_TEST( r.has_error() );
}
{
result<void, E2> r;
r &= fv;
BOOST_TEST( r.has_value() );
r &= fv2;
BOOST_TEST( r.has_error() );
r &= fv;
BOOST_TEST( r.has_error() );
}
return boost::report_errors();
}