From: Ronen Friedman <rfriedma@redhat.com>
Date: Sat, 11 Jan 2020 07:42:49 +0000 (+0200)
Subject: crimson: fix aarch64 ctest failure by removing some lambda attributes
X-Git-Tag: v15.1.0~255^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=968cd0060a742bb342d90c429890af08a8ec82f9;p=ceph-ci.git

crimson: fix aarch64 ctest failure by removing some lambda attributes

There seems to be no "universally accepted" way to declare a lambda as
[[always_inline]]. "Universally accepted" here meaning: accepted with
no error or warning by gcc8, gcc9 and clang.

See for example: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60503

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index f3911204b41..babe4f6e0e2 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -479,7 +479,7 @@ private:
       return this->then_wrapped(
         [ valfunc = std::forward<ValueFuncT>(valfunc),
           errfunc = std::forward<ErrorVisitorT>(errfunc)
-        ] (auto&& future) mutable noexcept [[gnu::always_inline]] {
+        ] (auto&& future) mutable noexcept {
           if (__builtin_expect(future.failed(), false)) {
             return _safe_then_handle_errors<futurator_t>(
               std::move(future), std::forward<ErrorVisitorT>(errfunc));
@@ -528,7 +528,7 @@ private:
 
       return this->then_wrapped(
 	[ func = std::forward<FuncT>(func)
-	] (auto&& future) mutable noexcept [[gnu::always_inline]] {
+	] (auto&& future) mutable noexcept {
 	  return futurator_t::apply(std::forward<FuncT>(func)).safe_then(
 	    [future = std::forward<decltype(future)>(future)]() mutable {
 	      return std::move(future);
@@ -572,7 +572,7 @@ private:
         typename return_errorator_t::template futurize<::seastar::future<ValuesT...>>;
       return this->then_wrapped(
         [ errfunc = std::forward<ErrorVisitorT>(errfunc)
-        ] (auto&& future) mutable noexcept [[gnu::always_inline]] {
+        ] (auto&& future) mutable noexcept {
           if (__builtin_expect(future.failed(), false)) {
             return _safe_then_handle_errors<futurator_t>(
               std::move(future), std::forward<ErrorVisitorT>(errfunc));