Don't use std::iterator<> as it's deprecated in C++17

laf

@@ -1 +1 @@
-Subproject commit af7c239ac6629f7bd102b3e648c0dd86c2054407
+Subproject commit f2110aef250cfdcd8ee5cb14fd28c3cbdfffa578

src/doc/image_iterator.h

@@ -1,4 +1,5 @@
 // Aseprite Document Library
+// Copyright (c) 2022 Igara Studio S.A.
 // Copyright (c) 2001-2015 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -14,7 +15,6 @@
 #include "gfx/rect.h"
 
 #include <cstdlib>
-#include <iterator>
 
 #include <iostream>
 
@@ -25,18 +25,15 @@ namespace doc {
   template<typename ImageTraits,
            typename PointerType,
            typename ReferenceType>
-  class ImageIteratorT : public std::iterator<std::forward_iterator_tag,
-                                              typename ImageTraits::pixel_t,
-                                              ptrdiff_t,
-                                              PointerType,
-                                              ReferenceType> {
+  class ImageIteratorT {
   public:
-    // GCC 4.6 needs these re-definitions here.
-    typedef ptrdiff_t difference_type;
-    typedef PointerType pointer;
-    typedef ReferenceType reference;
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = typename ImageTraits::pixel_t;
+    using difference_type = std::ptrdiff_t;
+    using pointer = PointerType;
+    using reference = ReferenceType;
 
-    ImageIteratorT() : m_ptr(NULL) {
+    ImageIteratorT() : m_ptr(nullptr) {
     }
 
     ImageIteratorT(const ImageIteratorT& other) :
@@ -141,17 +138,13 @@ namespace doc {
                                               typename ImageTraits::pixel_t *,
                                               typename ImageTraits::pixel_t&> {
   public:
-    // GCC 4.6 needs these re-definitions here.
-    typedef typename ImageTraits::pixel_t* pointer;
-    typedef typename ImageTraits::pixel_t& reference;
-
     ImageIterator() {
     }
 
     ImageIterator(const Image* image, const gfx::Rect& bounds, int x, int y) :
       ImageIteratorT<ImageTraits,
-                     pointer,
-                     reference>(image, bounds, x, y) {
+                     typename ImageIterator::pointer,
+                     typename ImageIterator::reference>(image, bounds, x, y) {
     }
   };
 
@@ -160,17 +153,13 @@ namespace doc {
                                                    typename ImageTraits::pixel_t const *,
                                                    typename ImageTraits::pixel_t const &> {
   public:
-    // GCC 4.6 needs these re-definitions here.
-    typedef typename ImageTraits::pixel_t const* pointer;
-    typedef typename ImageTraits::pixel_t const& reference;
-
     ImageConstIterator() {
     }
 
     ImageConstIterator(const Image* image, const gfx::Rect& bounds, int x, int y) :
       ImageIteratorT<ImageTraits,
-                     pointer,
-                     reference>(image, bounds, x, y) {
+                     typename ImageConstIterator::pointer,
+                     typename ImageConstIterator::reference>(image, bounds, x, y) {
     }
   };
 
@@ -180,7 +169,7 @@ namespace doc {
   class BitPixelAccess {
   public:
     BitPixelAccess() :
-      m_ptr(NULL),
+      m_ptr(nullptr),
       m_bit(0) {
     }
 
@@ -262,20 +251,17 @@ namespace doc {
 
   template<typename PointerType,
            typename ReferenceType>
-  class ImageIteratorT<BitmapTraits, PointerType, ReferenceType>
-    : public std::iterator<std::forward_iterator_tag,
-                           BitmapTraits::pixel_t,
-                           ptrdiff_t,
-                           PointerType,
-                           ReferenceType> {
+  class ImageIteratorT<BitmapTraits, PointerType, ReferenceType> {
   public:
-    // GCC 4.6 needs these re-definitions here.
-    typedef ptrdiff_t difference_type;
-    typedef PointerType pointer;
-    typedef ReferenceType reference;
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = BitmapTraits::pixel_t;
+    using difference_type = std::ptrdiff_t;
+    using pointer = PointerType;
+    using reference = ReferenceType;
+
     enum { pixels_per_byte = BitmapTraits::pixels_per_byte };
 
-    ImageIteratorT() : m_ptr(NULL) {
+    ImageIteratorT() : m_ptr(nullptr) {
     }
 
     ImageIteratorT(const ImageIteratorT& other) :

src/doc/selected_frames.h

@@ -1,4 +1,5 @@
 // Aseprite Document Library
+// Copyright (c) 2022 Igara Studio S.A.
 // Copyright (c) 2016-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -11,7 +12,6 @@
 #include "doc/frame_range.h"
 
 #include <iosfwd>
-#include <iterator>
 #include <vector>
 
 namespace doc {
@@ -20,9 +20,15 @@ namespace doc {
     typedef std::vector<FrameRange> Ranges;
 
   public:
-    class const_iterator : public std::iterator<std::forward_iterator_tag, frame_t> {
+    class const_iterator {
       static const int kNullFrame = -2;
     public:
+      using iterator_category = std::forward_iterator_tag;
+      using value_type = frame_t;
+      using difference_type = std::ptrdiff_t;
+      using pointer = frame_t*;
+      using reference = frame_t&;
+
       const_iterator(const Ranges::const_iterator& it)
         : m_it(it), m_frame(kNullFrame) {
       }
@@ -70,8 +76,14 @@ namespace doc {
       mutable frame_t m_frame;
     };
 
-    class const_reverse_iterator : public std::iterator<std::forward_iterator_tag, frame_t> {
+    class const_reverse_iterator {
     public:
+      using iterator_category = std::forward_iterator_tag;
+      using value_type = frame_t;
+      using difference_type = std::ptrdiff_t;
+      using pointer = frame_t*;
+      using reference = frame_t&;
+
       const_reverse_iterator(const Ranges::const_reverse_iterator& it)
         : m_it(it), m_frame(-1) {
       }