From: Adam C. Emerson <aemerson@redhat.com>
Date: Mon, 7 Mar 2022 22:58:38 +0000 (-0500)
Subject: include: Remove deprecated std::iterator from xlist
X-Git-Tag: v17.2.7~203^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b1ccd330c84382dee53978d4bfd1f1356258e03;p=ceph.git

include: Remove deprecated std::iterator from xlist

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 691119c389e119a03aea606b7c4093d46c6db43d)
---

diff --git a/src/include/xlist.h b/src/include/xlist.h
index 733a318a9bd..49510a7f1d2 100644
--- a/src/include/xlist.h
+++ b/src/include/xlist.h
@@ -183,10 +183,16 @@ public:
   iterator begin() { return iterator(_front); }
   iterator end() { return iterator(NULL); }
 
-  class const_iterator: std::iterator<std::forward_iterator_tag, T> {
+  class const_iterator {
   private:
     item *cur;
   public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = T;
+    using difference_type = std::ptrdiff_t;
+    using pointer = const T*;
+    using reference = const T&;
+
     const_iterator(item *i = 0) : cur(i) {}
     const T operator*() { return static_cast<const T>(cur->_item); }
     const_iterator& operator++() {