diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-02-05 15:58:30 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-02-05 17:29:25 +0100 |
commit | af3f74de8cada6cc9fe0962164f4aca8393b7774 (patch) | |
tree | e2e8c35ed4dd568734d63fa36bf47ccbcccd9a0b /include/qpdf/QPDFNumberTreeObjectHelper.hh | |
parent | 2e476e189a84bebbac04947518f83dc78c6d913b (diff) | |
download | qpdf-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 'include/qpdf/QPDFNumberTreeObjectHelper.hh')
-rw-r--r-- | include/qpdf/QPDFNumberTreeObjectHelper.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/qpdf/QPDFNumberTreeObjectHelper.hh b/include/qpdf/QPDFNumberTreeObjectHelper.hh index 4a7bfec0..cfe20b72 100644 --- a/include/qpdf/QPDFNumberTreeObjectHelper.hh +++ b/include/qpdf/QPDFNumberTreeObjectHelper.hh @@ -96,12 +96,17 @@ class QPDFNumberTreeObjectHelper: public QPDFObjectHelper bool findObjectAtOrBelow(numtree_number idx, QPDFObjectHandle& oh, numtree_number& offset); - class iterator: public std::iterator< - std::bidirectional_iterator_tag, - std::pair<numtree_number, QPDFObjectHandle>> + class iterator { friend class QPDFNumberTreeObjectHelper; public: + typedef std::pair<numtree_number, QPDFObjectHandle> T; + using iterator_category = std::bidirectional_iterator_tag; + using value_type = T; + using difference_type = long; + using pointer = T*; + using reference = T&; + virtual ~iterator() = default; QPDF_DLL bool valid() const; |