From: Kefu Chai <kchai@redhat.com>
Date: Wed, 9 Sep 2020 02:45:18 +0000 (+0800)
Subject: crimson/common: move continuation_base_from_future out of internal namespace
X-Git-Tag: v16.1.0~1157^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5563e0584b48a03a136e5ed06de54f8f802709fc;p=ceph.git

crimson/common: move continuation_base_from_future out of internal namespace

otherwise we have

../src/crimson/common/errorator.h:1090:8: error: specialization of ‘template<class Future> struct seastar::continuation_base_from_future’ in different namespace [-fpermissive]
 1090 | struct continuation_base_from_future<Container<::crimson::errorated_future_marker<Values...>>> {
      |        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

since seastar has moved its continuation_base_from_future() out
of seastar::internal into seastar namespace

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index d6301769394a..306c3cc6d0ad 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -1084,12 +1084,10 @@ private:
   friend class future;
 };
 
-namespace internal {
 template <template <class...> class Container,
           class... Values>
 struct continuation_base_from_future<Container<::crimson::errorated_future_marker<Values...>>> {
   using type = continuation_base<Values...>;
 };
-}
 
 } // namespace seastar