Remove usage of deprecated std::iterator

cloudflare · Jul 17, 2024 · 05d80fc · 05d80fc
1 parent a08fe27
commit 05d80fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/utf8/checked.h b/src/utf8/checked.h
@@ -261,11 +261,15 @@ namespace utf8
 
     // The iterator class
     template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+    // class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+    class iterator {
       octet_iterator it;
       octet_iterator range_start;
       octet_iterator range_end;
       public:
+      using iterator_category = std::bidirectional_iterator_tag;
+      using value_type = uint32_t;
+
       iterator () {};
       explicit iterator (const octet_iterator& octet_it,
                          const octet_iterator& range_start,

diff --git a/src/utf8/unchecked.h b/src/utf8/unchecked.h
@@ -176,9 +176,13 @@ namespace utf8
 
         // The iterator class
         template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+          // class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+          class iterator {
             octet_iterator it;
             public:
+            using iterator_category = std::bidirectional_iterator_tag;
+            using value_type = uint32_t;
+
             iterator () {};
             explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
             // the default "big three" are OK