update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rgw / rgw_aio_throttle.h

diff --git a/ceph/src/rgw/rgw_aio_throttle.h b/ceph/src/rgw/rgw_aio_throttle.h
index 764469d7ed38b6d3d77ce3e0430ee83f3cb8a523..04e93aaa09e890265b402c0dde30e626e8a5c0d7 100644 (file)
--- a/ceph/src/rgw/rgw_aio_throttle.h
+++ b/ceph/src/rgw/rgw_aio_throttle.h
@@ -78,7 +78,6 @@ class BlockingAioThrottle final : public Aio, private Throttle {
   AioResultList drain() override final;
 };
 
-#ifdef HAVE_BOOST_CONTEXT
 // a throttle that yields the coroutine instead of blocking. all public
 // functions must be called within the coroutine strand
 class YieldingAioThrottle final : public Aio, private Throttle {
@@ -112,12 +111,10 @@ class YieldingAioThrottle final : public Aio, private Throttle {
 
   AioResultList drain() override final;
 };
-#endif // HAVE_BOOST_CONTEXT
 
 // return a smart pointer to Aio
 inline auto make_throttle(uint64_t window_size, optional_yield y)
 {
-#ifdef HAVE_BOOST_CONTEXT
   std::unique_ptr<Aio> aio;
   if (y) {
     aio = std::make_unique<YieldingAioThrottle>(window_size,
@@ -127,9 +124,6 @@ inline auto make_throttle(uint64_t window_size, optional_yield y)
     aio = std::make_unique<BlockingAioThrottle>(window_size);
   }
   return aio;
-#else
-  return std::make_optional<BlockingAioThrottle>(window_size);
-#endif
 }
 
 } // namespace rgw