From: Kefu Chai <kchai@redhat.com>
Date: Mon, 23 Dec 2019 08:26:13 +0000 (+0800)
Subject: common,rgw: workaround for boost 1.72
X-Git-Tag: v14.2.8~28^2~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7118dbddeb3efe90924d3f43216f10ae59750bb1;p=ceph.git

common,rgw: workaround for boost 1.72

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)
---

diff --git a/src/common/async/yield_context.h b/src/common/async/yield_context.h
index fda9541eb43..436192c02f7 100644
--- a/src/common/async/yield_context.h
+++ b/src/common/async/yield_context.h
@@ -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"
diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc
index 82e2a45da6c..f48a779066a 100644
--- a/src/rgw/rgw_asio_frontend.cc
+++ b/src/rgw/rgw_asio_frontend.cc
@@ -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>
 
diff --git a/src/test/librados/asio.cc b/src/test/librados/asio.cc
index 9c86ad420c8..8fa4bab1977 100644
--- a/src/test/librados/asio.cc
+++ b/src/test/librados/asio.cc
@@ -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>