]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common,rgw: workaround for boost 1.72
authorKefu Chai <kchai@redhat.com>
Mon, 23 Dec 2019 08:26:13 +0000 (16:26 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 28 Dec 2019 04:33:51 +0000 (12:33 +0800)
see also https://github.com/boostorg/coroutine/issues/46

will need to remove this change once we require boost >= 1.73

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ea64c4909ffeae10e5d8e0a23604030e8849f803)

src/common/async/yield_context.h
src/rgw/rgw_asio_frontend.cc
src/test/librados/asio.cc

index fda9541eb436e9cd604690862205ea713f2b546d..436192c02f7d7f391661d279675b47e3167d2b55 100644 (file)
@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
 #include <boost/asio/io_context.hpp>
 
 #include "acconfig.h"
index 82e2a45da6c3abd6bf1a2bb4dd700dc1c57113c7..f48a779066a592a63a3dade3919d73ba9d92e852 100644 (file)
@@ -7,6 +7,8 @@
 
 #include <boost/asio.hpp>
 #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/intrusive/list.hpp>
 
index 9c86ad420c84044d3499fb28597cd9f7c6fd3864..8fa4bab197790ac7444780e05b1bb524dd3989c4 100644 (file)
@@ -21,6 +21,8 @@
 
 #ifdef HAVE_BOOST_CONTEXT
 #define BOOST_COROUTINES_NO_DEPRECATION_WARNING
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
 #include <boost/asio/spawn.hpp>
 #endif
 #include <boost/asio/use_future.hpp>