]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: tests: Fix building with -DWITH_BOOST_CONTEXT=OFF 29430/head
authorUlrich Weigand <ulrich.weigand@de.ibm.com>
Wed, 31 Jul 2019 15:38:23 +0000 (17:38 +0200)
committerUlrich Weigand <ulrich.weigand@de.ibm.com>
Wed, 31 Jul 2019 15:38:23 +0000 (17:38 +0200)
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>
src/test/rgw/test_rgw_dmclock_scheduler.cc

index 7d2ef9b3281a952f979947f18514016e6abf86a3..b7e9b0eabf7cacf0bd3f936cf034a2a65a0a344d 100644 (file)
@@ -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"