aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-08-20 22:29:44 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-08-21 12:03:05 +0000
commit1221ce7b41e2dc197780e49c4045245177035d0d (patch)
treea673afd1cbcd745b26c39ce48e4712ddf44f0883 /src
parent34a35f6a499250443108b2f634d7720112056438 (diff)
c++17: fix TypeFilter::const_iterator
MSVC complains about inheriting from std::iterator and suggests declaring typedefs manually Change-Id: I19cf1d9efd86fccb53827235d3659ef571d4f8b5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/buildgraph/nodeset.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/nodeset.h b/src/lib/corelib/buildgraph/nodeset.h
index 961a4bcc3..469988b19 100644
--- a/src/lib/corelib/buildgraph/nodeset.h
+++ b/src/lib/corelib/buildgraph/nodeset.h
@@ -71,11 +71,17 @@ public:
{
}
- class const_iterator : public std::iterator<std::forward_iterator_tag, T *>
+ class const_iterator
{
const NodeSet &m_nodes;
NodeSet::const_iterator m_it;
public:
+ using value_type = T*;
+ using difference_type = ptrdiff_t;
+ using pointer = value_type*;
+ using reference = value_type&;
+ using iterator_category = std::forward_iterator_tag;
+
const_iterator(const NodeSet &nodes, const NodeSet::const_iterator &it)
: m_nodes(nodes), m_it(it)
{