]> git.apps.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)
committerKefu Chai <tchaikov@gmail.com>
Thu, 17 Mar 2022 14:00:36 +0000 (22:00 +0800)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/include/xlist.h

index 7b482f70697ff1e13f9d6ab0893bbaff9a99a770..76d0ddccd3c3b0bc6307fdeee56622398c1f7873 100644 (file)
@@ -188,10 +188,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++() {