From 93852d1a7e2152d6eef28b617436f0a1a3227303 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Tue, 9 Apr 2024 03:01:38 +0300
Subject: [PATCH] Support result<void> &= fv. Refs #119.

---
 include/boost/system/result.hpp | 14 ++++++++++++++
 test/result_and_eq_fn1v.cpp     | 27 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/include/boost/system/result.hpp b/include/boost/system/result.hpp
index 5cd6802..456a792 100644
--- a/include/boost/system/result.hpp
+++ b/include/boost/system/result.hpp
@@ -1296,6 +1296,20 @@ result<T, E>& operator&=( result<T, E>& r, F&& f )
     return r;
 }
 
+template<class E, class F,
+    class U = decltype( std::declval<F>()() ),
+    class En = typename std::enable_if<!detail::is_result<U>::value>::type
+>
+result<void, E>& operator&=( result<void, E>& r, F&& f )
+{
+    if( r )
+    {
+        std::forward<F>( f )();
+    }
+
+    return r;
+}
+
 // result &= unary-returning-result
 
 template<class T, class E, class F,
diff --git a/test/result_and_eq_fn1v.cpp b/test/result_and_eq_fn1v.cpp
index 4085228..dc1247d 100644
--- a/test/result_and_eq_fn1v.cpp
+++ b/test/result_and_eq_fn1v.cpp
@@ -59,6 +59,13 @@ int& h( int& )
     return x;
 }
 
+static int fv_called;
+
+void fv()
+{
+    ++fv_called;
+}
+
 int main()
 {
     {
@@ -110,5 +117,25 @@ int main()
         BOOST_TEST( r.has_error() );
     }
 
+    {
+        result<void> r;
+        fv_called = 0;
+
+        r &= fv;
+
+        BOOST_TEST( r.has_value() );
+        BOOST_TEST_EQ( fv_called, 1 );
+    }
+
+    {
+        result<void, E> r( in_place_error );
+        fv_called = 0;
+
+        r &= fv;
+
+        BOOST_TEST( r.has_error() );
+        BOOST_TEST_EQ( fv_called, 0 );
+    }
+
     return boost::report_errors();
 }