Stop using std::iterator (fixes #618)

Create the typedefs directly in iterators rather than deriving from
the deprecated std::iterator class.

1 files changed, 8 insertions, 3 deletions

diff --git a/include/qpdf/QPDFNameTreeObjectHelper.hh b/include/qpdf/QPDFNameTreeObjectHelper.hh
index ea395c6a..baa6e5e9 100644
--- a/include/qpdf/QPDFNameTreeObjectHelper.hh
+++ b/include/qpdf/QPDFNameTreeObjectHelper.hh
@@ -77,12 +77,17 @@ class QPDFNameTreeObjectHelper: public QPDFObjectHelper
     QPDF_DLL
     bool findObject(std::string const& utf8, QPDFObjectHandle& oh);
 
-    class iterator: public std::iterator<
-        std::bidirectional_iterator_tag,
-        std::pair<std::string, QPDFObjectHandle>>
+    class iterator
     {
         friend class QPDFNameTreeObjectHelper;
       public:
+        typedef std::pair<std::string, 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;