osd: Cleanup boost optionals

Signed-off-by: William A. Kennington III <william@wkennington.com>
This commit is contained in:
William A. Kennington III 2014-09-20 22:52:31 -07:00
parent 7fe6e10544
commit a53ead14c1
2 changed files with 5 additions and 2 deletions

View File

@ -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";
}

View File

@ -5259,7 +5259,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();