Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1:Ports
ceph
0030-osd-Cleanup-boost-optionals.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0030-osd-Cleanup-boost-optionals.patch of Package ceph
From: "William A. Kennington III" <william@wkennington.com> Date: Sat, 20 Sep 2014 22:52:31 -0700 Subject: [PATCH] osd: Cleanup boost optionals Signed-off-by: William A. Kennington III <william@wkennington.com> (cherry picked from commit a53ead14c113047567177630b4906136a2109b65) --- src/osd/ECBackend.cc | 2 +- src/osd/ReplicatedPG.cc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 39e3429..5235d4d 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs) lhs << "read_result_t(r=" << rhs.r << ", errors=" << rhs.errors; if (rhs.attrs) { - lhs << ", attrs=" << rhs.attrs; + lhs << ", attrs=" << rhs.attrs.get(); } else { lhs << ", noattrs"; } diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index f1911c1..32705d0 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -5052,7 +5052,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx) for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin(); p != ctx->notify_acks.end(); ++p) { - dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl; + if (p->watch_cookie) + dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl; + else + dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl; for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i = ctx->obc->watchers.begin(); i != ctx->obc->watchers.end();
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor