aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2022-02-05 15:58:30 +0100
committerJay Berkenbilt <ejb@ql.org>2022-02-05 17:29:25 +0100
commitaf3f74de8cada6cc9fe0962164f4aca8393b7774 (patch)
treee2e8c35ed4dd568734d63fa36bf47ccbcccd9a0b /libqpdf
parent2e476e189a84bebbac04947518f83dc78c6d913b (diff)
downloadqpdf-af3f74de8cada6cc9fe0962164f4aca8393b7774.tar.zst
Stop using std::iterator (fixes #618)
Create the typedefs directly in iterators rather than deriving from the deprecated std::iterator class.
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/qpdf/NNTree.hh11
1 files changed, 8 insertions, 3 deletions
diff --git a/libqpdf/qpdf/NNTree.hh b/libqpdf/qpdf/NNTree.hh
index f4472662..f9acc0d1 100644
--- a/libqpdf/qpdf/NNTree.hh
+++ b/libqpdf/qpdf/NNTree.hh
@@ -17,12 +17,17 @@ class NNTreeDetails
};
class NNTreeImpl;
-class NNTreeIterator: public std::iterator<
- std::bidirectional_iterator_tag,
- std::pair<QPDFObjectHandle, QPDFObjectHandle>>
+class NNTreeIterator
{
friend class NNTreeImpl;
public:
+ typedef std::pair<QPDFObjectHandle, QPDFObjectHandle> T;
+ using iterator_category = std::bidirectional_iterator_tag;
+ using value_type = T;
+ using difference_type = long;
+ using pointer = T*;
+ using reference = T&;
+
virtual ~NNTreeIterator() = default;
bool valid() const;
NNTreeIterator& operator++();