]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
include: Remove deprecated std::iterator from xlist
authorAdam C. Emerson <aemerson@redhat.com>
Mon, 7 Mar 2022 22:58:38 +0000 (17:58 -0500)
committerRonen Friedman <rfriedma@redhat.com>
Thu, 29 Jun 2023 11:59:21 +0000 (06:59 -0500)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 691119c389e119a03aea606b7c4093d46c6db43d)

src/include/xlist.h

index 733a318a9bd73c2f5ee440b2467310a47be68b08..49510a7f1d24503aeb761100c2876226a4e86dd3 100644 (file)
@@ -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++() {