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>

diff --cc src/common/Cond.h
Simple merge

diff --cc src/kv/RocksDBStore.cc
Simple merge

diff --cc src/librbd/cache/PassthroughImageCache.h
Simple merge

diff --cc src/mgr/DaemonServer.cc
Simple merge

diff --cc src/mgr/MgrClient.h
Simple merge

diff --cc src/mon/FSCommands.cc
Simple merge

diff --cc src/msg/async/dpdk/EventDPDK.h
Simple merge

diff --cc src/msg/async/rdma/RDMAStack.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.h
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge

diff --cc src/rgw/rgw_cr_rest.h
Simple merge

diff --cc src/rgw/rgw_data_sync.cc
Simple merge

diff --cc src/rgw/rgw_es_query.cc
Simple merge

diff --cc src/rgw/rgw_keystone.h
index 71ac781a8918291b371f10f192ba207158c80d21,281582c783745e7c69cb7fdf3c9b66221fcb96b1..8790f2999033e80d57d196bfcf0529b239990de2
--- 1/src/rgw/rgw_keystone.h
--- 2/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_lc_s3.h
Simple merge

diff --cc src/rgw/rgw_op.h
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/rgw/rgw_rest_config.h
Simple merge

diff --cc src/rgw/rgw_rest_s3.h
Simple merge

diff --cc src/rgw/rgw_sync.cc
index 6993bfcef5e560e42ce75070b34102a018d933ed,bda0b85f54c71361d54cdfcf2a06d3d288419e99..eb199acf9b9cbf22f68ca1addf908d9b31c8d451
--- 1/src/rgw/rgw_sync.cc
--- 2/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()

diff --cc src/rgw/rgw_sync.h
Simple merge

diff --cc src/rgw/rgw_sync_log_trim.cc
Simple merge

diff --cc src/rgw/rgw_sync_module_aws.cc
Simple merge

diff --cc src/rgw/rgw_sync_module_es_rest.cc
Simple merge

diff --cc src/test/common/test_static_ptr.cc
Simple merge