Skip to content

Commit 11884e4

Browse files
committed
graphite2: remove deprecated std::iterator
Change-Id: I786a29a597ada820629a9a045b548bffd1df6a0c
1 parent 855e907 commit 11884e4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Lib/src/graphite2/src/GlyphCache.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@ namespace
4444
// variable length structures.
4545

4646
template<typename W>
47-
class _glat_iterator : public std::iterator<std::input_iterator_tag, std::pair<sparse::key_type, sparse::mapped_type> >
47+
class _glat_iterator
4848
{
4949
unsigned short key() const { return be::peek<W>(_e) + _n; }
5050
unsigned int run() const { return be::peek<W>(_e+sizeof(W)); }
5151
void advance_entry() { _n = 0; _e = _v; be::skip<W>(_v,2); }
5252
public:
53+
using iterator_category = std::input_iterator_tag;
54+
using value_type = std::pair<sparse::key_type, sparse::mapped_type>;
55+
using difference_type = ptrdiff_t;
56+
using pointer = value_type *;
57+
using reference = value_type &;
58+
5359
_glat_iterator(const void * glat=0) : _e(reinterpret_cast<const byte *>(glat)), _v(_e+2*sizeof(W)), _n(0) {}
5460

5561
_glat_iterator<W> & operator ++ () {

0 commit comments

Comments
 (0)