From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 21 Mar 2018 18:32:53 +0000 (-0400)
Subject: common: update mClockPriorityQueue use of remove_by
X-Git-Tag: v13.1.0~400^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ff4ab5caa5970e2ad1090be0c931ef1d0c836f1;p=ceph.git

common: update mClockPriorityQueue use of remove_by

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/common/mClockPriorityQueue.h b/src/common/mClockPriorityQueue.h
index 0871b9d7ee0..124273b398b 100644
--- a/src/common/mClockPriorityQueue.h
+++ b/src/common/mClockPriorityQueue.h
@@ -244,7 +244,9 @@ namespace ceph {
     // to the list so items end up on list in front-to-back priority
     // order
     void remove_by_filter(std::function<bool (T&&)> filter_accum) {
-      queue.remove_by_req_filter(filter_accum, true);
+      queue.remove_by_req_filter([&] (std::unique_ptr<T>&& r) {
+          return filter_accum(std::move(*r));
+        }, true);
 
       for (auto i = queue_front.rbegin(); i != queue_front.rend(); /* no-inc */) {
 	if (filter_accum(std::move(i->second))) {
@@ -270,8 +272,8 @@ namespace ceph {
       if (out) {
 	queue.remove_by_client(k,
 			       true,
-			       [&out] (T&& t) {
-				 out->push_front(std::move(t));
+			       [&out] (std::unique_ptr<T>&& t) {
+				 out->push_front(std::move(*t));
 			       });
       } else {
 	queue.remove_by_client(k, true);