diff options
| author | Kefu Chai <kchai@redhat.com> | 2018-06-19 08:30:57 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2018-06-26 11:52:04 +0200 |
| commit | da5d156b6bdffdd31e4edbadc1cdfc69197bef49 (patch) | |
| tree | ff30d2366d670e0344554be12e0d6787170a158e /src/os/bluestore/BlueStore.cc | |
| parent | Merge PR #22479 into master (diff) | |
| download | ceph-da5d156b6bdffdd31e4edbadc1cdfc69197bef49.tar.xz ceph-da5d156b6bdffdd31e4edbadc1cdfc69197bef49.zip | |
include/memory.h: remove memory.h
memory.h was introduced back when the shared_ptrs were still in TR1, but
we've moved to C++17 now. and the C++ clients should be compiled with
a C++11 compatible compiler. so there is no need to have this file anymore.
also replace all references of ceph::shared_ptr and ceph::weak_ptr with
std::shared_ptr and std::weak_ptr accordingly.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/os/bluestore/BlueStore.cc')
| -rw-r--r-- | src/os/bluestore/BlueStore.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 1d5b5e7695c..1c8a7aae75f 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -4780,7 +4780,7 @@ int BlueStore::_open_db(bool create, bool to_repair_db) string fn = path + "/db"; string options; stringstream err; - ceph::shared_ptr<Int64ArrayMergeOperator> merge_op(new Int64ArrayMergeOperator); + std::shared_ptr<Int64ArrayMergeOperator> merge_op(new Int64ArrayMergeOperator); string kv_backend; std::vector<KeyValueDB::ColumnFamily> cfs; |