From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 28 Nov 2019 15:39:05 +0000 (+0100)
Subject: crimson/common/errorator.h: simplify the compound safe_then() variant.
X-Git-Tag: v15.1.0~724^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31918%2Fhead;p=ceph.git

crimson/common/errorator.h: simplify the compound safe_then() variant.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index 17a95403fe6d..38fb93bd72f7 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -521,17 +521,15 @@ private:
     // taking ErrorFuncOne and ErrorFuncTwo separately from ErrorFuncTail
     // to avoid SFINAE
     template <class ValueFunc,
-              class ErrorFuncOne,
-              class ErrorFuncTwo,
+              class ErrorFuncHead,
               class... ErrorFuncTail>
     auto safe_then(ValueFunc&& value_func,
-                   ErrorFuncOne&& error_func_one,
-                   ErrorFuncTwo&& error_func_two,
+                   ErrorFuncHead&& error_func_head,
                    ErrorFuncTail&&... error_func_tail) {
+      static_assert(sizeof...(ErrorFuncTail) > 0);
       return safe_then(
         std::forward<ValueFunc>(value_func),
-        composer(std::forward<ErrorFuncOne>(error_func_one),
-                 std::forward<ErrorFuncTwo>(error_func_two),
+        composer(std::forward<ErrorFuncHead>(error_func_head),
                  std::forward<ErrorFuncTail>(error_func_tail)...));
     }