From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Wed, 31 Jul 2019 15:38:23 +0000 (+0200)
Subject: rgw: tests: Fix building with -DWITH_BOOST_CONTEXT=OFF
X-Git-Tag: v14.2.5~88^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3259fc246038c1feadee36519952d31206c6d37;p=ceph.git

rgw: tests: Fix building with -DWITH_BOOST_CONTEXT=OFF

Attempting to build with -DWITH_BOOST_CONTEXT=OFF will result in
a "conflicting declaration" error when building
test/rgw/test_rgw_dmclock_scheduler.cc

Fixed by avoiding the boost/asio/spawn.hpp include in that case.

Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
(cherry picked from commit 82d66424b786d54116a1373f0fcff9cfbae0aa0f)
Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
---

diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc b/src/test/rgw/test_rgw_dmclock_scheduler.cc
index 7d2ef9b3281..b7e9b0eabf7 100644
--- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
@@ -18,7 +18,9 @@
 #include "rgw/rgw_dmclock_async_scheduler.h"
 
 #include <optional>
+#ifdef HAVE_BOOST_CONTEXT
 #include <boost/asio/spawn.hpp>
+#endif
 #include <gtest/gtest.h>
 #include "acconfig.h"
 #include "global/global_context.h"