From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 10 Feb 2023 15:36:22 +0000 (-0500)
Subject: neorados: use strand template and make_strand()
X-Git-Tag: v19.3.0~349^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=521211fe2fd53061e41eadc17561f9fb183e6f78;p=ceph.git

neorados: use strand template and make_strand()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/neorados/RADOS.cc b/src/neorados/RADOS.cc
index 15b74f8e78d1..fabf2d5b3570 100644
--- a/src/neorados/RADOS.cc
+++ b/src/neorados/RADOS.cc
@@ -1127,7 +1127,7 @@ void RADOS::flush_watch(std::unique_ptr<VoidOpComp> c)
 
 struct NotifyHandler : std::enable_shared_from_this<NotifyHandler> {
   boost::asio::io_context& ioc;
-  boost::asio::io_context::strand strand;
+  boost::asio::strand<boost::asio::io_context::executor_type> strand;
   Objecter* objecter;
   Objecter::LingerOp* op;
   std::unique_ptr<RADOS::NotifyComp> c;
@@ -1141,7 +1141,8 @@ struct NotifyHandler : std::enable_shared_from_this<NotifyHandler> {
 		Objecter* objecter,
 		Objecter::LingerOp* op,
 		std::unique_ptr<RADOS::NotifyComp> c)
-    : ioc(ioc), strand(ioc), objecter(objecter), op(op), c(std::move(c)) {}
+    : ioc(ioc), strand(boost::asio::make_strand(ioc)),
+      objecter(objecter), op(op), c(std::move(c)) {}
 
   // Use bind or a lambda to pass this in.
   void handle_ack(bs::error_code ec,