]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12276 from kylinstorage/wip-cleanup-makeshared
authorJohn Spray <jspray@redhat.com>
Fri, 6 Jan 2017 13:11:03 +0000 (13:11 +0000)
committerGitHub <noreply@github.com>
Fri, 6 Jan 2017 13:11:03 +0000 (13:11 +0000)
cleanup: use std::make_shared to replace new

Reviewed-by: John Spray <john.spray@redhat.com>
17 files changed:
1  2 
src/common/LogClient.cc
src/log/Log.cc
src/mds/CInode.cc
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/Migrator.cc
src/mds/Server.cc
src/mon/Elector.cc
src/mon/LogMonitor.cc
src/mon/Monitor.cc
src/mon/MonitorDBStore.h
src/mon/MonmapMonitor.cc
src/mon/OSDMonitor.cc
src/mon/Paxos.cc
src/mon/Paxos.h
src/os/filestore/FileStore.cc
src/tools/ceph_monstore_tool.cc

Simple merge
diff --cc src/log/Log.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/mon/Paxos.h
index 432ce3d9c56838d584b5397bc2652d03382c5852,37007d03a41f86b45c4b27827b9bff5e1df097ee..99caf77c0319193d989721fd8920276f8a2c4025
@@@ -1357,9 -1358,9 +1357,9 @@@ inline ostream& operator<<(ostream& out
  {
    string proposed = (p.proposed ? "proposed" : "unproposed");
    out << " " << proposed
 -      << " queued " << (ceph_clock_now(NULL) - p.proposal_time)
 +      << " queued " << (ceph_clock_now() - p.proposal_time)
        << " tx dump:\n";
-   MonitorDBStore::TransactionRef t(new MonitorDBStore::Transaction);
+   auto t(std::make_shared<MonitorDBStore::Transaction>());
    bufferlist::iterator p_it = p.bl.begin();
    t->decode(p_it);
    JSONFormatter f(true);
Simple merge
Simple merge