From: Kefu Chai <kchai@redhat.com>
Date: Sun, 6 Dec 2020 07:41:49 +0000 (+0800)
Subject: librados: move definition of cct_deleter to .cc
X-Git-Tag: v17.0.0~374^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f88b410652ff9306a25a523eaccddaaf03342101;p=ceph-ci.git

librados: move definition of cct_deleter to .cc

so cct->get() and cct->put() are visually closer. this improves the
readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 5915e6a147a..47b928058c4 100644
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -56,7 +56,9 @@ namespace ca = ceph::async;
 namespace cb = ceph::buffer;
 
 librados::RadosClient::RadosClient(CephContext *cct_)
-  : Dispatcher(cct_->get()) {
+  : Dispatcher(cct_->get()),
+    cct_deleter{cct, [](CephContext *p) {p->put();}}
+{
   auto& conf = cct->_conf;
   conf.add_observer(this);
   rados_mon_op_timeout = conf.get_val<std::chrono::seconds>("rados_mon_op_timeout");
diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index 10d3baea13d..0db094b1800 100644
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -50,8 +50,7 @@ public:
   using Dispatcher::cct;
 private:
   std::unique_ptr<CephContext,
-		  std::function<void(CephContext*)> > cct_deleter{
-    cct, [](CephContext *p) {p->put();}};
+		  std::function<void(CephContext*)>> cct_deleter;
 
 public:
   const ConfigProxy& conf{cct->_conf};