Merge pull request #7769 from somnathr/wip-make-shared

Use make_shared while creating shared_ptr

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/os/ObjectStore.h
Simple merge

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

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

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

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

diff --cc src/osd/ReplicatedPG.h
index aece2f100e16d5d0ad378518332e05037a91f13a,00d1826af23e19ed99a7139dde9d2478eba65431..3d24617e8d9b77d0f019b15ea497c28ad18e6728
--- 1/src/osd/ReplicatedPG.h
--- 2/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@@ -251,10 -249,11 +251,10 @@@ public
  
      FlushOp()
        : flushed_version(0), objecter_tid(0), rval(0),
 -      blocking(false), removal(false),
 -      on_flush(NULL) {}
 +      blocking(false), removal(false) {}
      ~FlushOp() { assert(!on_flush); }
    };
-   typedef boost::shared_ptr<FlushOp> FlushOpRef;
+   typedef ceph::shared_ptr<FlushOp> FlushOpRef;
  
    boost::scoped_ptr<PGBackend> pgbackend;
    PGBackend *get_pgbackend() {