From 82d66424b786d54116a1373f0fcff9cfbae0aa0f Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 31 Jul 2019 17:38:23 +0200 Subject: [PATCH] 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 --- src/test/rgw/test_rgw_dmclock_scheduler.cc | 2 ++ 1 file changed, 2 insertions(+) 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 +#ifdef HAVE_BOOST_CONTEXT #include +#endif #include #include "acconfig.h" #include "global/global_context.h" -- 2.39.5