From f14f913fbfcd66526037ac8c5d94d88da05be3b6 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 29 Jan 2019 17:18:21 +0800 Subject: [PATCH] osd/HitSet: mark copy ctor of HitSet::Params noexcept to be returned using seastar::future<...> the value type should satisfy std::is_nothrow_constructible. with this change, pg_pool_t will be nothrow_constructible. and hence can be returned using seastar::future. otherwise std::is_nothrow_constructible::value would be false. Signed-off-by: Kefu Chai --- src/osd/HitSet.cc | 2 +- src/osd/HitSet.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/HitSet.cc b/src/osd/HitSet.cc index 227a738769b..653c4448d38 100644 --- a/src/osd/HitSet.cc +++ b/src/osd/HitSet.cc @@ -107,7 +107,7 @@ void HitSet::generate_test_instances(list& o) o.back()->insert(hobject_t("qwer", "", CEPH_NOSNAP, 456, 1, "")); } -HitSet::Params::Params(const Params& o) +HitSet::Params::Params(const Params& o) noexcept { if (o.get_type() != TYPE_NONE) { create_impl(o.get_type()); diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h index 943f4064714..7e50fd930ad 100644 --- a/src/osd/HitSet.h +++ b/src/osd/HitSet.h @@ -104,7 +104,7 @@ public: return TYPE_NONE; } - Params(const Params& o); + Params(const Params& o) noexcept; const Params& operator=(const Params& o); void encode(bufferlist &bl) const; -- 2.39.5