[LyX/master] Get rid of std::iterator
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Fri Oct 15 15:50:32 UTC 2021
commit a29ced557744d6606a7b04f4ed9f45af4c3a6c29
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Fri Oct 15 17:38:13 2021 +0200
Get rid of std::iterator
clang's libc++ 13 tells us that it is deprecated in C++17.
Fortunately, we do not need it after all.
---
src/ParIterator.h | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/ParIterator.h b/src/ParIterator.h
index f1e2752..2253a1d 100644
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -25,18 +25,9 @@ class Paragraph;
class ParagraphList;
-class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
- public DocIterator
+class ParIterator : public DocIterator
{
public:
- typedef std::iterator<std::forward_iterator_tag, Paragraph> StdIt;
-
- typedef StdIt::value_type value_type;
- typedef StdIt::difference_type difference_type;
- typedef StdIt::pointer pointer;
- typedef StdIt::reference reference;
-
- ///
///
ParIterator(Buffer * buf) : DocIterator(buf) {}
///
@@ -87,13 +78,11 @@ ParIterator par_iterator_end(Inset & inset);
//bool operator!=(ParIterator const & it1, ParIterator const & it2);
-class ParConstIterator : public std::iterator<std::forward_iterator_tag,
- Paragraph>,
- public DocIterator
+class ParConstIterator : public DocIterator
{
public:
///
- ParConstIterator(Buffer const * buf)
+ ParConstIterator(Buffer const * buf)
: DocIterator(const_cast<Buffer *>(buf)) {}
///
ParConstIterator(ParConstIterator const & pi)
More information about the lyx-cvs
mailing list