]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/common: move continuation_base_from_future out of internal namespace
authorKefu Chai <kchai@redhat.com>
Wed, 9 Sep 2020 02:45:18 +0000 (10:45 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 9 Sep 2020 05:27:25 +0000 (13:27 +0800)
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>
src/crimson/common/errorator.h

index d6301769394af39b9a2fa2ea6ba5b061a19c3940..306c3cc6d0ad9581c88b61a3cf25c7bb45a7672c 100644 (file)
@@ -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