From: Samuel Just <sjust@redhat.com>
Date: Mon, 29 Feb 2016 23:04:28 +0000 (-0800)
Subject: Merge pull request #7769 from somnathr/wip-make-shared
X-Git-Tag: v10.1.0~276
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=440e9b5d5603ac43e7ccbc436a82f0cf6b1544d2;p=ceph.git

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

Use make_shared while creating shared_ptr

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

440e9b5d5603ac43e7ccbc436a82f0cf6b1544d2
diff --cc src/osd/ReplicatedPG.h
index aece2f100e16,00d1826af23e..3d24617e8d9b
--- a/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() {