42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001
|
|
From: "William A. Kennington III" <william@wkennington.com>
|
|
Date: Sat, 20 Sep 2014 22:52:31 -0700
|
|
Subject: [PATCH] Cleanup boost optionals
|
|
|
|
---
|
|
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 a87b5b4..c386900 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 5e5510d..79e8616 100644
|
|
--- a/src/osd/ReplicatedPG.cc
|
|
+++ b/src/osd/ReplicatedPG.cc
|
|
@@ -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();
|
|
--
|
|
2.1.0
|
|
|