From ee2eaeb2dd53204797b398dea8a69ff7ed8f5cb4 Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 20 Sep 2019 13:32:37 +0200
Subject: [PATCH] crimson: unthrowable_wrapper::handle() accepts type-taking
 lambda.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---
 src/crimson/common/errorator.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index bc5ea00653e..0df8b8b8d53 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -65,7 +65,11 @@ struct unthrowable_wrapper : error_t<unthrowable_wrapper<ErrorT, ErrorV>> {
     return [
       func = std::forward<Func>(func)
     ] (const unthrowable_wrapper&) mutable -> decltype(auto) {
-      return std::invoke(std::forward<Func>(func));
+      if constexpr (std::is_invocable_v<Func, ErrorT>) {
+        return std::invoke(std::forward<Func>(func), ErrorV);
+      } else {
+        return std::invoke(std::forward<Func>(func));
+      }
     };
   }
 
-- 
2.39.5