From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 6 May 2018 03:34:52 +0000 (+0800)
Subject: Merge pull request #21637 from ceph/wip-da-SCA-20180423
X-Git-Tag: v14.0.0~206
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c17e3d834615f3dae0aaf2bfbece5965d7a94887;p=ceph.git

Merge pull request #21637 from ceph/wip-da-SCA-20180423

misc: mark constructors as explicit

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

c17e3d834615f3dae0aaf2bfbece5965d7a94887
diff --cc src/rgw/rgw_keystone.h
index 71ac781a8918,281582c78374..8790f2999033
--- a/src/rgw/rgw_keystone.h
+++ b/src/rgw/rgw_keystone.h
@@@ -352,20 -352,20 +352,20 @@@ class BarbicanTokenRequestVer2 : publi
    CephContext *cct;
  
  public:
-   BarbicanTokenRequestVer2(CephContext * const _cct)
+   explicit BarbicanTokenRequestVer2(CephContext * const _cct)
      : cct(_cct) {
    }
 -  void dump(Formatter *f) const;
 +  void dump(Formatter *f) const override;
  };
  
  class BarbicanTokenRequestVer3 : public AdminTokenRequest {
    CephContext *cct;
  
  public:
-   BarbicanTokenRequestVer3(CephContext * const _cct)
+   explicit BarbicanTokenRequestVer3(CephContext * const _cct)
      : cct(_cct) {
    }
 -  void dump(Formatter *f) const;
 +  void dump(Formatter *f) const override;
  };
  
  
diff --cc src/rgw/rgw_sync.cc
index 6993bfcef5e5,bda0b85f54c7..eb199acf9b9c
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@@ -2976,9 -2976,9 +2976,9 @@@ class MetaPeerTrimCR : public RGWCorout
    rgw_mdlog_info mdlog_info; //< master's mdlog info
  
   public:
-   MetaPeerTrimCR(PeerTrimEnv& env) : RGWCoroutine(env.store->ctx()), env(env) {}
+   explicit MetaPeerTrimCR(PeerTrimEnv& env) : RGWCoroutine(env.store->ctx()), env(env) {}
  
 -  int operate();
 +  int operate() override;
  };
  
  int MetaPeerTrimCR::operate()